gentoo-full-overlay/media-video/mplayer/files/mplayer-1.1-ffmpeg.patch

34 lines
1.4 KiB
Diff

Let it build with ffmpeg 0.10.3.
Index: MPlayer-1.1/fmt-conversion.c
===================================================================
--- MPlayer-1.1.orig/fmt-conversion.c
+++ MPlayer-1.1/fmt-conversion.c
@@ -65,9 +65,13 @@ static const struct {
{IMGFMT_RGBA, PIX_FMT_RGB0},
{IMGFMT_RGB64LE, PIX_FMT_RGBA64LE},
{IMGFMT_RGB64BE, PIX_FMT_RGBA64BE},
+#if LIBAVUTIL_VERSION_INT >= AV_VERSION_INT(51, 50, 0)
{IMGFMT_422A, PIX_FMT_YUVA422P},
+#endif
+#if LIBAVUTIL_VERSION_INT >= AV_VERSION_INT(51, 35, 101)
{IMGFMT_444A, PIX_FMT_YUVA444P},
#endif
+#endif
#if LIBAVUTIL_VERSION_INT >= AV_VERSION_INT(51, 20, 1)
{IMGFMT_GBR24P, PIX_FMT_GBRP},
#endif
Index: MPlayer-1.1/libmpdemux/mp_taglists.c
===================================================================
--- MPlayer-1.1.orig/libmpdemux/mp_taglists.c
+++ MPlayer-1.1/libmpdemux/mp_taglists.c
@@ -125,7 +125,9 @@ static const struct AVCodecTag mp_bmp_ta
{ CODEC_ID_BMV_VIDEO, MKTAG('B', 'M', 'V', 'V')},
{ CODEC_ID_C93, MKTAG('C', '9', '3', 'V')},
{ CODEC_ID_CDGRAPHICS, MKTAG('C', 'D', 'G', 'R')},
+#if LIBAVCODEC_VERSION_INT > AV_VERSION_INT(54,1,0)
{ CODEC_ID_CDXL, MKTAG('C', 'D', 'X', 'L')},
+#endif
{ CODEC_ID_CMV, MKTAG('M', 'V', 'I', 'f')},
{ CODEC_ID_DFA, MKTAG('C', 'D', 'F', 'A')},
{ CODEC_ID_DNXHD, MKTAG('A', 'V', 'd', 'n')},