diff options
| author | alex <alex@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-01-07 17:33:59 +0000 |
|---|---|---|
| committer | alex <alex@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-01-07 17:33:59 +0000 |
| commit | daba8a0477f174595e63de50e6715e806f7fdce2 (patch) | |
| tree | 78ef0647e604b273ad7bb17278209e69856bebec /libvo/vo_x11.c | |
| parent | 662be7e939f6a8cb9970f12cc316b1f6964c57f8 (diff) | |
| download | mpv-daba8a0477f174595e63de50e6715e806f7fdce2.tar.bz2 mpv-daba8a0477f174595e63de50e6715e806f7fdce2.tar.xz | |
added rgb24to32 instead of c converter
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@4037 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libvo/vo_x11.c')
| -rw-r--r-- | libvo/vo_x11.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/libvo/vo_x11.c b/libvo/vo_x11.c index 266614f35f..c61ca9daaa 100644 --- a/libvo/vo_x11.c +++ b/libvo/vo_x11.c @@ -27,7 +27,7 @@ LIBVO_EXTERN( x11 ) #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 @@ static uint32_t draw_frame( uint8_t *src[] ){ 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 @@ static uint32_t draw_frame( uint8_t *src[] ){ d[2]=s[2]; s+=sbpp;d+=dbpp; } +#else + rgb24to32(s, d, sbpp*image_width*image_height); +#endif } } return 0; |