diff options
author | zdar <zdar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-12-29 18:07:18 +0000 |
---|---|---|
committer | zdar <zdar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-12-29 18:07:18 +0000 |
commit | 03a58e7c7b9f535462f62a207d8aae5f2e7f5119 (patch) | |
tree | 0fade83d8351e1f37d15874c59dafc09518ef348 /libvo/vo_directfb2.c | |
parent | 68e60c62f0ace5811182f633fdf0c2b60f9f6434 (diff) | |
download | mpv-03a58e7c7b9f535462f62a207d8aae5f2e7f5119.tar.bz2 mpv-03a58e7c7b9f535462f62a207d8aae5f2e7f5119.tar.xz |
fix to compile with DirecFB 0.9.16
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8641 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libvo/vo_directfb2.c')
-rw-r--r-- | libvo/vo_directfb2.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/libvo/vo_directfb2.c b/libvo/vo_directfb2.c index 69dafe5d63..75c10b2ce5 100644 --- a/libvo/vo_directfb2.c +++ b/libvo/vo_directfb2.c @@ -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; |