[FFmpeg-devel] Patch for ticket #3144

Vallimar vallimar at gmail.com
Sat Nov 16 02:08:44 CET 2013


Looks like just a couple bits got missed, adding in these (plus a few bits
on the mplayer side) appeared to have me running normally again.


--- libavcodec/old_codec_ids.h.fix 2013-11-15 19:33:03.186655430 -0500
+++ libavcodec/old_codec_ids.h 2013-11-15 19:35:40.875169356 -0500
@@ -34,7 +34,9 @@
     /* video codecs */
     CODEC_ID_MPEG1VIDEO,
     CODEC_ID_MPEG2VIDEO, ///< preferred ID for MPEG-1/2 video decoding
+#if FF_API_XVMC
     CODEC_ID_MPEG2VIDEO_XVMC,
+#endif
     CODEC_ID_H261,
     CODEC_ID_H263,
     CODEC_ID_RV10,



--- libavfilter/vf_mp.c.fix 2013-11-15 10:39:52.522648157 -0500
+++ libavfilter/vf_mp.c 2013-11-15 10:40:38.987908090 -0500
@@ -111,8 +111,11 @@ static const struct {
     {IMGFMT_444P,  AV_PIX_FMT_YUVJ444P},
     {IMGFMT_440P,  AV_PIX_FMT_YUVJ440P},

+#if FF_API_XVMC
     {IMGFMT_XVMC_MOCO_MPEG2, AV_PIX_FMT_XVMC_MPEG2_MC},
     {IMGFMT_XVMC_IDCT_MPEG2, AV_PIX_FMT_XVMC_MPEG2_IDCT},
+#endif /* FF_API_XVMC */
+
     {IMGFMT_VDPAU_MPEG1,     AV_PIX_FMT_VDPAU_MPEG1},
     {IMGFMT_VDPAU_MPEG2,     AV_PIX_FMT_VDPAU_MPEG2},
     {IMGFMT_VDPAU_H264,      AV_PIX_FMT_VDPAU_H264},


More information about the ffmpeg-devel mailing list