summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKlaus Schmidinger <vdr@tvdr.de>2001-09-15 14:19:31 +0200
committerKlaus Schmidinger <vdr@tvdr.de>2001-09-15 14:19:31 +0200
commit68e3afeb66418e5951ce8ee4c777418bf41e4890 (patch)
tree13f4ad59d952231b31b6990cdecbf07412a22ebf
parentc9796296cd7fb62d51b435f4996fbd9f2603c65e (diff)
downloadvdr-68e3afeb66418e5951ce8ee4c777418bf41e4890.tar.gz
vdr-68e3afeb66418e5951ce8ee4c777418bf41e4890.tar.bz2
Changed obsolete macro VIDEO_WINDOW_CHROMAKEY to VID_TYPE_CHROMAKEY
-rw-r--r--HISTORY2
-rw-r--r--dvbapi.c7
2 files changed, 7 insertions, 2 deletions
diff --git a/HISTORY b/HISTORY
index df60e3a6..fc430c12 100644
--- a/HISTORY
+++ b/HISTORY
@@ -747,3 +747,5 @@ Video Disk Recorder Revision History
OSD is used (thanks to Andreas Vitting).
- Switched to the driver's new tuning API (VDR now requires a driver version
dated 2001-09-14 or higher).
+- Changed obsolete macro VIDEO_WINDOW_CHROMAKEY to VID_TYPE_CHROMAKEY (thanks
+ to Guido Fiala).
diff --git a/dvbapi.c b/dvbapi.c
index fe675d10..86c692b6 100644
--- a/dvbapi.c
+++ b/dvbapi.c
@@ -7,7 +7,7 @@
* DVD support initially written by Andreas Schultz <aschultz@warp10.net>
* based on dvdplayer-0.5 by Matjaz Thaler <matjaz.thaler@guest.arnes.si>
*
- * $Id: dvbapi.c 1.120 2001/09/15 13:51:27 kls Exp $
+ * $Id: dvbapi.c 1.121 2001/09/15 14:15:21 kls Exp $
*/
//#define DVDDEBUG 1
@@ -2824,7 +2824,10 @@ bool cDvbApi::OvlG(int SizeX, int SizeY, int PosX, int PosY)
vw.width = SizeX;
vw.height = SizeY;
vw.chromakey = ovlPalette;
- vw.flags = VIDEO_WINDOW_CHROMAKEY; // VIDEO_WINDOW_INTERLACE; //VIDEO_CLIP_BITMAP;
+#ifndef VID_TYPE_CHROMAKEY // name changed somewhere down the road in kernel 2.4.x
+#define VID_TYPE_CHROMAKEY VIDEO_WINDOW_CHROMAKEY
+#endif
+ vw.flags = VID_TYPE_CHROMAKEY; // VIDEO_WINDOW_INTERLACE; //VIDEO_CLIP_BITMAP;
vw.clips = ovlClipRects;
vw.clipcount = ovlClipCount;
result |= ioctl(videoDev, VIDIOCSWIN, &vw);