summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAaron Plattner <aplattner@nvidia.com>2006-04-07 23:06:47 +0000
committerAaron Plattner <aplattner@nvidia.com>2006-04-07 23:06:47 +0000
commitc13ae9c043919c33f2770e58db01903a6a9826bf (patch)
tree0da0d548abcd237cd025adb028f1ad6b103eba42
parentc19d1b6306f3cd28ef069ac25c1fc5442b7a7eb6 (diff)
Add a DrawablePtr argument to the XV functions to pave the way for
redirected video.
-rw-r--r--ChangeLog6
-rw-r--r--src/ct_video.c6
2 files changed, 10 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 0cae139..ee88a90 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-04-07 Aaron Plattner <aplattner@nvidia.com>
+
+ * src/ct_video.c: (CHIPSPutImage):
+ Add a DrawablePtr argument to the XV functions to pave the way for
+ redirected video.
+
2006-04-06 Adam Jackson <ajax@freedesktop.org>
* configure.ac:
diff --git a/src/ct_video.c b/src/ct_video.c
index 81b6de2..19467d7 100644
--- a/src/ct_video.c
+++ b/src/ct_video.c
@@ -38,7 +38,8 @@ static void CHIPSQueryBestSize(ScrnInfoPtr, Bool,
short, short, short, short, unsigned int *, unsigned int *, pointer);
static int CHIPSPutImage( ScrnInfoPtr,
short, short, short, short, short, short, short, short,
- int, unsigned char*, short, short, Bool, RegionPtr, pointer);
+ int, unsigned char*, short, short, Bool, RegionPtr, pointer,
+ DrawablePtr);
static int CHIPSQueryImageAttributes(ScrnInfoPtr,
int, unsigned short *, unsigned short *, int *, int *);
static void CHIPSVideoTimerCallback(ScrnInfoPtr pScrn, Time time);
@@ -659,7 +660,8 @@ CHIPSPutImage(
int id, unsigned char* buf,
short width, short height,
Bool sync,
- RegionPtr clipBoxes, pointer data
+ RegionPtr clipBoxes, pointer data,
+ DrawablePtr pDraw
){
CHIPSPortPrivPtr pPriv = (CHIPSPortPrivPtr)data;
CHIPSPtr cPtr = CHIPSPTR(pScrn);