[MPlayer-dev-eng] [PATCH][BUG] GUI shows black when X depth is 16/15 bpp

[Raindel Shachar]

I attach a fix to the problem described in:
http://mplayerhq.hu/pipermail/mplayer-dev-eng/2003-July/019494.html
The bug came out to be that sws_rgb2rgb_init was called, but only after
the critical step in which ws.c copied the relevant function pointer to
wsConvFunc. Someone deserves 1000l for this.
Maybe we want to preinit the function pointers so that they will print
something like "Call to an rgb2rgb function without calling to
sws_rgb2rgb_init first. Please report." - this bug wasn't discovered since
the function pointers were NULL, and the rest of the cde uses "wsConvFunc"
only if it is not NULL.

Cheers
Shachar
-------------- next part --------------
diff -ur original/Gui/wm/ws.c Gui-fix/Gui/wm/ws.c
--- original/Gui/wm/ws.c	Tue Jun  3 15:28:18 2003
+++ Gui-fix/Gui/wm/ws.c	Sat Jul 12 17:12:42 2003
@@ -283,6 +283,7 @@
 #endif
  wsOutMask=wsGetOutMask();
  mp_dbg( MSGT_GPLAYER,MSGL_DBG2,"[ws] Initialized converter: " );
+  sws_rgb2rgb_init(get_sws_cpuflags());
  switch ( wsOutMask )
   {
    case wsRGB32:
@@ -318,7 +319,6 @@
      wsConvFunc=rgb32tobgr15;
      break;
   }
-  sws_rgb2rgb_init(get_sws_cpuflags());
  XSetErrorHandler( wsErrorHandler );
 }