[Mplayer-cvslog] CVS: main/libvo vosub_vidix.h,1.5,1.6 vosub_vidix.c,1.13,1.14 vo_xvidix.c,1.8,1.9

[Alex Beregszaszi]

Update of /cvsroot/mplayer/main/libvo
In directory mplayer:/var/tmp.root/cvs-serv16605

Modified Files:
	vosub_vidix.h vosub_vidix.c vo_xvidix.c 
Log Message:
vidix_grkey_support checking for colorkeying

Index: vosub_vidix.h
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vosub_vidix.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- vosub_vidix.h	18 Jan 2002 18:14:44 -0000	1.5
+++ vosub_vidix.h	19 Jan 2002 16:58:33 -0000	1.6
@@ -30,6 +30,7 @@
 
 #include "../vidix/vidix.h"
 /* graphic keys */
+int vidix_grkey_support(void);
 int vidix_grkey_get(vidix_grkey_t *gr_key);
 int vidix_grkey_set(const vidix_grkey_t *gr_key);
 

Index: vosub_vidix.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vosub_vidix.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- vosub_vidix.c	18 Jan 2002 18:14:44 -0000	1.13
+++ vosub_vidix.c	19 Jan 2002 16:58:33 -0000	1.14
@@ -190,6 +190,7 @@
 	printf("vosub_vidix: Can't start playback: %s\n",strerror(err));
 	return -1;
     }
+    
     vid_eq.brightness = vo_gamma_brightness;
     vid_eq.saturation = vo_gamma_saturation;
     vid_eq.contrast = vo_gamma_contrast;
@@ -371,6 +372,11 @@
   vidix_fourcc.fourcc = format;
   vdlQueryFourcc(vidix_handler,&vidix_fourcc);
   return vidix_fourcc.depth != VID_DEPTH_NONE;
+}
+
+int vidix_grkey_support(void)
+{
+    return (vidix_fourcc.flags & VID_CAP_COLORKEY);
 }
 
 int vidix_grkey_get(vidix_grkey_t *gr_key)

Index: vo_xvidix.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_xvidix.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- vo_xvidix.c	18 Jan 2002 18:15:43 -0000	1.8
+++ vo_xvidix.c	19 Jan 2002 16:58:33 -0000	1.9
@@ -187,7 +187,6 @@
 static uint32_t init(uint32_t width, uint32_t height, uint32_t d_width,
     uint32_t d_height, uint32_t flags, char *title, uint32_t format)
 {
-    unsigned int fg, bg;
     XVisualInfo vinfo;
     XEvent xev;
     XSizeHints hint;
@@ -359,13 +358,16 @@
 }
 #endif
 
-    vidix_grkey_get(&gr_key);
-    gr_key.key_op = KEYS_PUT;
-    gr_key.ckey.op = CKEY_TRUE;
-    gr_key.ckey.red = 255;
-    gr_key.ckey.green = 0;
-    gr_key.ckey.blue = 255;
-    vidix_grkey_set(&gr_key);
+    if (vidix_grkey_support())
+    {
+	vidix_grkey_get(&gr_key);
+	gr_key.key_op = KEYS_PUT;
+	gr_key.ckey.op = CKEY_TRUE;
+	gr_key.ckey.red = 255;
+	gr_key.ckey.green = 0;
+	gr_key.ckey.blue = 255;
+	vidix_grkey_set(&gr_key);
+    }
 
     set_window(1);