Mercurial > mplayer.hg

changeset 4036:76ea6f97ebb7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
added rgb24to32 instead of c converter
author alex
date Mon, 07 Jan 2002 17:33:59 +0000
parents 607a4a565f04
children 2ec3b5e24955
files libvo/vo_x11.c
diffstat 1 files changed, 5 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/libvo/vo_x11.c	Mon Jan 07 15:49:49 2002 +0000
+++ b/libvo/vo_x11.c	Mon Jan 07 17:33:59 2002 +0000
@@ -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;