[FFmpeg-cvslog] lavc: deprecate unused FF_BUG_OLD_MSMPEG4

[Anton Khirnov]

ffmpeg | branch: master | Anton Khirnov <anton at khirnov.net> | Sun Oct 27 11:42:05 2013 +0100| [eb5920c195d1b0bda81782af4ba0c5982f5225b3] | committer: Anton Khirnov

lavc: deprecate unused FF_BUG_OLD_MSMPEG4

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=eb5920c195d1b0bda81782af4ba0c5982f5225b3
---

 libavcodec/avcodec.h       |    2 ++
 libavcodec/options_table.h |    2 ++
 libavcodec/version.h       |    3 +++
 3 files changed, 7 insertions(+)

diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index c91df59..76b3fc4 100644
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -2251,7 +2251,9 @@ typedef struct AVCodecContext {
      */
     int workaround_bugs;
 #define FF_BUG_AUTODETECT       1  ///< autodetection
+#if FF_API_OLD_MSMPEG4
 #define FF_BUG_OLD_MSMPEG4      2
+#endif
 #define FF_BUG_XVID_ILACE       4
 #define FF_BUG_UMP4             8
 #define FF_BUG_NO_PADDING       16
diff --git a/libavcodec/options_table.h b/libavcodec/options_table.h
index 6b9cbd6..853aa62 100644
--- a/libavcodec/options_table.h
+++ b/libavcodec/options_table.h
@@ -118,7 +118,9 @@ static const AVOption avcodec_options[] = {
 {"codec_tag", NULL, OFFSET(codec_tag), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX},
 {"bug", "work around not autodetected encoder bugs", OFFSET(workaround_bugs), AV_OPT_TYPE_FLAGS, {.i64 = FF_BUG_AUTODETECT }, INT_MIN, INT_MAX, V|D, "bug"},
 {"autodetect", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_BUG_AUTODETECT }, INT_MIN, INT_MAX, V|D, "bug"},
+#if FF_API_OLD_MSMPEG4
 {"old_msmpeg4", "some old lavc-generated MSMPEG4v3 files (no autodetection)", 0, AV_OPT_TYPE_CONST, {.i64 = FF_BUG_OLD_MSMPEG4 }, INT_MIN, INT_MAX, V|D, "bug"},
+#endif
 {"xvid_ilace", "Xvid interlacing bug (autodetected if FOURCC == XVIX)", 0, AV_OPT_TYPE_CONST, {.i64 = FF_BUG_XVID_ILACE }, INT_MIN, INT_MAX, V|D, "bug"},
 {"ump4", "(autodetected if FOURCC == UMP4)", 0, AV_OPT_TYPE_CONST, {.i64 = FF_BUG_UMP4 }, INT_MIN, INT_MAX, V|D, "bug"},
 {"no_padding", "padding bug (autodetected)", 0, AV_OPT_TYPE_CONST, {.i64 = FF_BUG_NO_PADDING }, INT_MIN, INT_MAX, V|D, "bug"},
diff --git a/libavcodec/version.h b/libavcodec/version.h
index 0e2ae6f..bf0ed73 100644
--- a/libavcodec/version.h
+++ b/libavcodec/version.h
@@ -82,5 +82,8 @@
 #ifndef FF_API_AC_VLC
 #define FF_API_AC_VLC            (LIBAVCODEC_VERSION_MAJOR < 56)
 #endif
+#ifndef FF_API_OLD_MSMPEG4
+#define FF_API_OLD_MSMPEG4       (LIBAVCODEC_VERSION_MAJOR < 56)
+#endif
 
 #endif /* AVCODEC_VERSION_H */