diff options
| author | Anton Khirnov <anton@khirnov.net> | 2013-02-23 08:20:12 +0100 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2013-03-09 08:36:40 +0100 |
| commit | d03a94e2b752216b1b66eff33e411a8d69f220e9 (patch) | |
| tree | e3be7be87a2f9655a465b646d96f059cb87df21d | |
| parent | 2a113695238e7675ab75c5fb9a5f59fc92f2ddd9 (diff) | |
| download | ffmpeg-d03a94e2b752216b1b66eff33e411a8d69f220e9.tar.gz | |
lavc: remove disabled FF_API_SUB_ID cruft
| -rw-r--r-- | libavcodec/avcodec.h | 7 | ||||
| -rw-r--r-- | libavcodec/options_table.h | 3 | ||||
| -rw-r--r-- | libavcodec/version.h | 3 |
3 files changed, 0 insertions, 13 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 6aa7dcab83..865785d360 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -1040,13 +1040,6 @@ typedef struct AVCodecContext { */ unsigned int stream_codec_tag; -#if FF_API_SUB_ID - /** - * @deprecated this field is unused - */ - attribute_deprecated int sub_id; -#endif - void *priv_data; /** diff --git a/libavcodec/options_table.h b/libavcodec/options_table.h index 7c81d5e7f1..6090a81913 100644 --- a/libavcodec/options_table.h +++ b/libavcodec/options_table.h @@ -71,9 +71,6 @@ static const AVOption options[]={ {"noout", "skip bitstream encoding", 0, AV_OPT_TYPE_CONST, {.i64 = CODEC_FLAG2_NO_OUTPUT }, INT_MIN, INT_MAX, V|E, "flags2"}, {"ignorecrop", "ignore cropping information from sps", 1, AV_OPT_TYPE_CONST, {.i64 = CODEC_FLAG2_IGNORE_CROP }, INT_MIN, INT_MAX, V|D, "flags2"}, {"local_header", "place global headers at every keyframe instead of in extradata", 0, AV_OPT_TYPE_CONST, {.i64 = CODEC_FLAG2_LOCAL_HEADER }, INT_MIN, INT_MAX, V|E, "flags2"}, -#if FF_API_SUB_ID -{"sub_id", NULL, OFFSET(sub_id), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX}, -#endif {"me_method", "set motion estimation method", OFFSET(me_method), AV_OPT_TYPE_INT, {.i64 = ME_EPZS }, INT_MIN, INT_MAX, V|E, "me_method"}, {"zero", "zero motion estimation (fastest)", 0, AV_OPT_TYPE_CONST, {.i64 = ME_ZERO }, INT_MIN, INT_MAX, V|E, "me_method" }, {"full", "full motion estimation (slowest)", 0, AV_OPT_TYPE_CONST, {.i64 = ME_FULL }, INT_MIN, INT_MAX, V|E, "me_method" }, diff --git a/libavcodec/version.h b/libavcodec/version.h index 72a880c280..be3a5ebd58 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -49,9 +49,6 @@ #ifndef FF_API_REQUEST_CHANNELS #define FF_API_REQUEST_CHANNELS (LIBAVCODEC_VERSION_MAJOR < 56) #endif -#ifndef FF_API_SUB_ID -#define FF_API_SUB_ID (LIBAVCODEC_VERSION_MAJOR < 55) -#endif #ifndef FF_API_DSP_MASK #define FF_API_DSP_MASK (LIBAVCODEC_VERSION_MAJOR < 55) #endif |