aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAurelien Jacobs <aurel@gnuage.org>2010-03-13 18:19:36 +0000
committerAurelien Jacobs <aurel@gnuage.org>2010-03-13 18:19:36 +0000
commit382b5b3a0ca57c28191f8d44cb3411bb4ac4ce5e (patch)
treea412fac6f7a0770f2eff222b9bb630dc956c8990
parent74dc70c42578fcb8d3a1e3dc7675f5b352a81765 (diff)
downloadffmpeg-382b5b3a0ca57c28191f8d44cb3411bb4ac4ce5e.tar.gz
CODEC_ID_XVID is not used anywhere, remove it at next major bump
Originally committed as revision 22511 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r--libavcodec/avcodec.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index d192b2893d..d57f883a73 100644
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -125,7 +125,9 @@ enum CodecID {
CODEC_ID_QDRAW,
CODEC_ID_VIXL,
CODEC_ID_QPEG,
+#if LIBAVCODEC_VERSION_MAJOR < 53
CODEC_ID_XVID,
+#endif
CODEC_ID_PNG,
CODEC_ID_PPM,
CODEC_ID_PBM,