RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

fix to compile with DirecFB 0.9.16 

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8641 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
zdar 2002-12-29 18:07:18 +00:00
parent 68e60c62f0
commit 03a58e7c7b
2 changed files with 22 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
libvo/vo_dfbmga.c
View File

@ -138,8 +138,13 @@ pixelformat_name( DFBSurfacePixelFormat format )
return "RGB24";
case DSPF_RGB16:
return "RGB16";
#if DIRECTFBVERSION > 915
case DSPF_ARGB1555:
return "ARGB1555";
#else
case DSPF_RGB15:
return "RGB15";
#endif
case DSPF_YUY2:
return "YUY2";
case DSPF_UYVY:
@ -170,7 +175,11 @@ imgfmt_to_pixelformat( uint32_t format )
return DSPF_RGB16;
case IMGFMT_RGB15:
case IMGFMT_BGR15:
#if DIRECTFBVERSION > 915
return DSPF_ARGB1555;
#else
return DSPF_RGB15;
#endif
case IMGFMT_YUY2:
return DSPF_YUY2;
case IMGFMT_UYVY:
@ -539,7 +548,11 @@ draw_alpha( int x0, int y0,
((uint8_t *) dst) + pitch * y0 + subframe_pixel_size * x0,
pitch );
break;
#if DIRECTFBVERSION > 915
case DSPF_ARGB1555:
#else
case DSPF_RGB15:
#endif
vo_draw_alpha_rgb15( w, h, src, srca, stride,
((uint8_t *) dst) + pitch * y0 + subframe_pixel_size * x0,
pitch );

10
libvo/vo_directfb2.c
View File

@ -262,8 +262,13 @@ DFBSurfacePixelFormat convformat(uint32_t format)
case IMGFMT_BGR24: return DSPF_RGB24; break;
case IMGFMT_RGB16: return DSPF_RGB16; break;
case IMGFMT_BGR16: return DSPF_RGB16; break;
#if DIRECTFBVERSION > 915
case IMGFMT_RGB15: return DSPF_ARGB1555; break;
case IMGFMT_BGR15: return DSPF_ARGB1555; break;
#else
case IMGFMT_RGB15: return DSPF_RGB15; break;
case IMGFMT_BGR15: return DSPF_RGB15; break;
#endif
case IMGFMT_YUY2: return DSPF_YUY2; break;
case IMGFMT_UYVY: return DSPF_UYVY; break;
case IMGFMT_YV12: return DSPF_YV12; break;
@ -1209,8 +1214,11 @@ static void draw_alpha(int x0, int y0, int w, int h, unsigned char *src,
case DSPF_RGB16:
vo_draw_alpha_rgb16(w,h,src,srca,stride,((uint8_t *) dst)+pitch*y0 + 2*x0,pitch);
break;
#if DIRECTFBVERSION > 915
case DSPF_ARGB1555:
#else
case DSPF_RGB15:
#endif
vo_draw_alpha_rgb15(w,h,src,srca,stride,((uint8_t *) dst)+pitch*y0 + 2*x0,pitch);
break;