lavc: schedule FF_BUG_AC_VLC for removal on the next major bump.

It has been deprecated/unused for about 10 years.

diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index fb8ca4b0cddffc9791ff5579ea50575ed0736f74..c91df59163d6bf0c6cc722472f3550256a32c2c3 100644 (file)
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -2256,7 +2256,9 @@ typedef struct AVCodecContext {
 #define FF_BUG_UMP4             8
 #define FF_BUG_NO_PADDING       16
 #define FF_BUG_AMV              32
+#if FF_API_AC_VLC
 #define FF_BUG_AC_VLC           0  ///< Will be removed, libavcodec can now handle these non-compliant files by default.
+#endif
 #define FF_BUG_QPEL_CHROMA      64
 #define FF_BUG_STD_QPEL         128
 #define FF_BUG_QPEL_CHROMA2     256

diff --git a/libavcodec/options_table.h b/libavcodec/options_table.h
index 5be447e4b6f012969e67849b693318b1a10171af..6b9cbd6fa92ea538db9ce1818301cb605513b47c 100644 (file)
--- a/libavcodec/options_table.h
+++ b/libavcodec/options_table.h
@@ -123,7 +123,9 @@ static const AVOption avcodec_options[] = {
 {"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"},
 {"amv", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_BUG_AMV }, INT_MIN, INT_MAX, V|D, "bug"},
+#if FF_API_AC_VLC
 {"ac_vlc", "illegal VLC bug (autodetected per FOURCC)", 0, AV_OPT_TYPE_CONST, {.i64 = FF_BUG_AC_VLC }, INT_MIN, INT_MAX, V|D, "bug"},
+#endif
 {"qpel_chroma", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_BUG_QPEL_CHROMA }, INT_MIN, INT_MAX, V|D, "bug"},
 {"std_qpel", "old standard qpel (autodetected per FOURCC/version)", 0, AV_OPT_TYPE_CONST, {.i64 = FF_BUG_STD_QPEL }, INT_MIN, INT_MAX, V|D, "bug"},
 {"qpel_chroma2", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_BUG_QPEL_CHROMA2 }, INT_MIN, INT_MAX, V|D, "bug"},

diff --git a/libavcodec/version.h b/libavcodec/version.h
index aaa61cc02b94e0e781b25d93a607fc6aee65fa12..0e2ae6f05d896198fb39a20c18c1c6590fe79c4d 100644 (file)
--- a/libavcodec/version.h
+++ b/libavcodec/version.h
@@ -79,5 +79,8 @@
 #ifndef FF_API_DEBUG_MV
 #define FF_API_DEBUG_MV          (LIBAVCODEC_VERSION_MAJOR < 56)
 #endif
+#ifndef FF_API_AC_VLC
+#define FF_API_AC_VLC            (LIBAVCODEC_VERSION_MAJOR < 56)
+#endif
 
 #endif /* AVCODEC_VERSION_H */