virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-15 14:13:16 +02:00
Code Issues Releases Activity

lavc: Drop deprecated stream codec tag

Browse Source 
Deprecated in 07/2015.
This commit is contained in:
Vittorio Giovara
2017-03-16 16:21:54 -04:00
parent 94eed68ace
commit 0648dec19d
4 changed files with 3 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
libavcodec/avcodec.h
View File

@@ -1217,14 +1217,6 @@ typedef struct AVCodecContext {
*/ */
unsigned int codec_tag; 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; void *priv_data;
/** /**

3
libavcodec/options_table.h
View File

@@ -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"}, {"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"}, {"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"}, {"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 #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}, {"sc_threshold", "scene change threshold", OFFSET(scenechange_threshold), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX, V|E},
#endif #endif

5
libavcodec/version.h
View File

@@ -47,11 +47,8 @@
* the public API and may change, break or disappear at any time. * 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 #ifndef FF_API_CODED_FRAME
#define FF_API_CODED_FRAME (LIBAVCODEC_VERSION_MAJOR < 58) #define FF_API_CODED_FRAME (LIBAVCODEC_VERSION_MAJOR < 59)
#endif #endif
#ifndef FF_API_SIDEDATA_ONLY_PKT #ifndef FF_API_SIDEDATA_ONLY_PKT
#define FF_API_SIDEDATA_ONLY_PKT (LIBAVCODEC_VERSION_MAJOR < 59) #define FF_API_SIDEDATA_ONLY_PKT (LIBAVCODEC_VERSION_MAJOR < 59)

4
libavutil/version.h
View File

@@ -91,10 +91,10 @@
#define FF_API_CRYPTO_CONTEXT (LIBAVUTIL_VERSION_MAJOR < 57) #define FF_API_CRYPTO_CONTEXT (LIBAVUTIL_VERSION_MAJOR < 57)
#endif #endif
#ifndef FF_API_PLUS1_MINUS1 #ifndef FF_API_PLUS1_MINUS1
#define FF_API_PLUS1_MINUS1 (LIBAVUTIL_VERSION_MAJOR < 56) #define FF_API_PLUS1_MINUS1 (LIBAVUTIL_VERSION_MAJOR < 57)
#endif #endif
#ifndef FF_API_ERROR_FRAME #ifndef FF_API_ERROR_FRAME
#define FF_API_ERROR_FRAME (LIBAVUTIL_VERSION_MAJOR < 56) #define FF_API_ERROR_FRAME (LIBAVUTIL_VERSION_MAJOR < 57)
#endif #endif
#ifndef FF_API_VAAPI #ifndef FF_API_VAAPI
#define FF_API_VAAPI (LIBAVUTIL_VERSION_MAJOR < 57) #define FF_API_VAAPI (LIBAVUTIL_VERSION_MAJOR < 57)