From 9abd90701ea9079860a535d24b0a60f9538e56bd Mon Sep 17 00:00:00 2001
From: arpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Sat, 12 Jul 2003 17:19:18 +0000
Subject: [PATCH] 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. Raindel Shachar
 <raindel@techunix.technion.ac.il>

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10412 b3059339-0415-0410-9bf9-f77b7e298cf2
---
 Gui/wm/ws.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gui/wm/ws.c b/Gui/wm/ws.c
index 350b35fcbd..db77d5528e 100644
--- a/Gui/wm/ws.c
+++ b/Gui/wm/ws.c
@@ -283,6 +283,7 @@ wsXDNDInitialize();
 #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 @@ wsXDNDInitialize();
      wsConvFunc=rgb32tobgr15;
      break;
   }
-  sws_rgb2rgb_init(get_sws_cpuflags());
  XSetErrorHandler( wsErrorHandler );
 }