Magellan Linux

Annotation of /trunk/mplayer/patches/mplayer-1.0_git20120314-ffmpeg.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 1703 - (hide annotations) (download)
Wed Mar 14 14:29:14 2012 UTC (12 years, 3 months ago) by niro
File size: 650 byte(s)
-fix build against recent ffmpeg
1 niro 1703 Some guards so that it can still build with ffmpeg 0.10
2    
3     Index: mplayer-1.0_rc4_p20120213/fmt-conversion.c
4     ===================================================================
5     --- mplayer-1.0_rc4_p20120213.orig/fmt-conversion.c
6     +++ mplayer-1.0_rc4_p20120213/fmt-conversion.c
7     @@ -65,8 +65,10 @@ static const struct {
8     {IMGFMT_RGBA, PIX_FMT_RGB0},
9     {IMGFMT_RGB64LE, PIX_FMT_RGBA64LE},
10     {IMGFMT_RGB64BE, PIX_FMT_RGBA64BE},
11     +#if LIBAVUTIL_VERSION_INT >= AV_VERSION_INT(51, 35, 101)
12     {IMGFMT_444A, PIX_FMT_YUVA444P},
13     #endif
14     +#endif
15     #if LIBAVUTIL_VERSION_INT >= AV_VERSION_INT(51, 20, 1)
16     {IMGFMT_GBR24P, PIX_FMT_GBRP},
17     #endif