diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-01 19:03:04 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-01 19:03:19 +0100 |
| commit | 7592d30bcb95427c3173b7dd2b4d68f7083c5a9c (patch) | |
| tree | 6a05812d0734898b3eacc65c721b7bfd87d7bc2f | |
| parent | 9bcf647867cf0c8ddad0b728264bcf77c36299ee (diff) | |
| parent | 0300962b76644f145b773439989a5cdf1667e162 (diff) | |
| download | ffmpeg-7592d30bcb95427c3173b7dd2b4d68f7083c5a9c.tar.gz | |
Merge commit '0300962b76644f145b773439989a5cdf1667e162'
* commit '0300962b76644f145b773439989a5cdf1667e162':
lavc: schedule FF_BUG_AC_VLC for removal on the next major bump.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/avcodec.h | 2 | ||||
| -rw-r--r-- | libavcodec/options_table.h | 2 | ||||
| -rw-r--r-- | libavcodec/version.h | 3 |
3 files changed, 7 insertions, 0 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 5068f9f33c..1b6e413bdb 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -2398,7 +2398,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 7c8b187736..3ef7c76216 100644 --- a/libavcodec/options_table.h +++ b/libavcodec/options_table.h @@ -128,7 +128,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 02117c753a..b8cc7f80c2 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -106,5 +106,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 */ |