[Mplayer-cvslog] CVS: main/libvo vo_x11.c,1.46,1.47

[Alex Beregszaszi]

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

Modified Files:
	vo_x11.c 
Log Message:
added rgb24to32 instead of c converter

Index: vo_x11.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_x11.c,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- vo_x11.c	6 Jan 2002 21:07:20 -0000	1.46
+++ vo_x11.c	7 Jan 2002 17:33:59 -0000	1.47
@@ -27,7 +27,7 @@
 
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
-//#include <X11/extensions/XShm.h>
+
 #ifdef HAVE_XF86VM
 #include <X11/extensions/xf86vmode.h>
 #endif
@@ -540,6 +540,7 @@
         memcpy( d,s,sbpp*image_width*image_height );
     } else {
         // sbpp!=dbpp
+#if 0
       char *e=s+sbpp*image_width*image_height;
       //printf( "libvo: using C 24->32bpp conversion\n" );
       while( s<e ){
@@ -548,6 +549,9 @@
         d[2]=s[2];
         s+=sbpp;d+=dbpp;
       }
+#else
+      rgb24to32(s, d, sbpp*image_width*image_height);
+#endif
     }
   }
   return 0;