diff options
| author | Vittorio Giovara <vittorio.giovara@gmail.com> | 2017-03-16 16:21:54 -0400 |
|---|---|---|
| committer | Vittorio Giovara <vittorio.giovara@gmail.com> | 2017-03-23 10:09:17 +0100 |
| commit | 0648dec19db83bc8c87814d195e32cbad5698a40 (patch) | |
| tree | 00ec5acdead35b54f6a58f126a8e6b20e67fb0a0 /libavcodec | |
| parent | 94eed68ace9f2416af8457fcbf142b175928c06b (diff) | |
| download | ffmpeg-0648dec19db83bc8c87814d195e32cbad5698a40.tar.gz | |
lavc: Drop deprecated stream codec tag
Deprecated in 07/2015.
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/avcodec.h | 8 | ||||
| -rw-r--r-- | libavcodec/options_table.h | 3 | ||||
| -rw-r--r-- | libavcodec/version.h | 5 |
3 files changed, 1 insertions, 15 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 4bcead7106..1c58fe2d68 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -1217,14 +1217,6 @@ typedef struct AVCodecContext { */ unsigned int codec_tag; -#if FF_API_STREAM_CODEC_TAG - /** - * @deprecated this field is unused - */ - attribute_deprecated - unsigned int stream_codec_tag; -#endif - void *priv_data; /** diff --git a/libavcodec/options_table.h b/libavcodec/options_table.h index 8868cea5e3..925ef376f3 100644 --- a/libavcodec/options_table.h +++ b/libavcodec/options_table.h @@ -233,9 +233,6 @@ static const AVOption avcodec_options[] = { {"simple", "use mbcmp (default)", 0, AV_OPT_TYPE_CONST, {.i64 = FF_MB_DECISION_SIMPLE }, INT_MIN, INT_MAX, V|E, "mbd"}, {"bits", "use fewest bits", 0, AV_OPT_TYPE_CONST, {.i64 = FF_MB_DECISION_BITS }, INT_MIN, INT_MAX, V|E, "mbd"}, {"rd", "use best rate distortion", 0, AV_OPT_TYPE_CONST, {.i64 = FF_MB_DECISION_RD }, INT_MIN, INT_MAX, V|E, "mbd"}, -#if FF_API_STREAM_CODEC_TAG -{"stream_codec_tag", NULL, OFFSET(stream_codec_tag), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX}, -#endif #if FF_API_PRIVATE_OPT {"sc_threshold", "scene change threshold", OFFSET(scenechange_threshold), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX, V|E}, #endif diff --git a/libavcodec/version.h b/libavcodec/version.h index e79701ecaa..4fb0a97a27 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -47,11 +47,8 @@ * the public API and may change, break or disappear at any time. */ -#ifndef FF_API_STREAM_CODEC_TAG -#define FF_API_STREAM_CODEC_TAG (LIBAVCODEC_VERSION_MAJOR < 58) -#endif #ifndef FF_API_CODED_FRAME -#define FF_API_CODED_FRAME (LIBAVCODEC_VERSION_MAJOR < 58) +#define FF_API_CODED_FRAME (LIBAVCODEC_VERSION_MAJOR < 59) #endif #ifndef FF_API_SIDEDATA_ONLY_PKT #define FF_API_SIDEDATA_ONLY_PKT (LIBAVCODEC_VERSION_MAJOR < 59) |