Merge commit 'cf7860db608df7c76471d8b61f07abbd5aad8dd5'

[ffmpeg] / libavcodec / old_codec_ids.h

diff --git a/libavcodec/old_codec_ids.h b/libavcodec/old_codec_ids.h
index d8a8f746d9adbbab9eb36d5a16364f349a04137b..b956264f387aef53c092b6435de0cc79a612e66b 100644 (file)
--- a/libavcodec/old_codec_ids.h
+++ b/libavcodec/old_codec_ids.h
@@ -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,