# HG changeset patch
# User alex
# Date 1053724812 0
# Node ID 9cee07f898f7f25ddd49cbaed74ae62a92f07229
# Parent  69bb88bc869b2893bcf32623ee01dd9543d631f9
swscaler doesn't recognizes support for BGR1/BGR4 too, and so if forced it crashes, without checking the swsContext

diff -r 69bb88bc869b -r 9cee07f898f7 libvo/vo_x11.c
--- a/libvo/vo_x11.c	Fri May 23 20:35:56 2003 +0000
+++ b/libvo/vo_x11.c	Fri May 23 21:20:12 2003 +0000
@@ -398,6 +398,8 @@
 
   /* always allocate swsContext as size could change between frames */
   swsContext= sws_getContextFromCmdLine(width, height, in_format, width, height, out_format );
+  if (!swsContext)
+    return -1;
 
   //printf( "X11 bpp: %d  color mask:  R:%lX  G:%lX  B:%lX\n",bpp,myximage->red_mask,myximage->green_mask,myximage->blue_mask );
 
@@ -565,7 +567,7 @@
     mp_msg(MSGT_VO,MSGL_DBG2,"vo_x11: query_format was called: %x (%s)\n",format,vo_format_name(format));
     if (IMGFMT_IS_BGR(format))
     {
-	if (IMGFMT_BGR_DEPTH(format) == 8)
+	if (IMGFMT_BGR_DEPTH(format) <= 8)
 	    return 0; // TODO 8bpp not yet fully implemented
 	if (IMGFMT_BGR_DEPTH(format) == vo_depthonscreen)
 	    return 3|VFCAP_OSD|VFCAP_SWSCALE|VFCAP_FLIP|VFCAP_ACCEPT_STRIDE;