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 | 9d6cf81f02d37d5e5ca334e2fc789abe6236eda1 (patch) | |
| tree | 8a50991d466431e5fcf2b65ec9eb0fcf11d3ce7c | |
| parent | 3b0f586f07bc58a9d97e3fd699a9aa29f7f4beea (diff) | |
lavc: remove disabled FF_API_COLOR_TABLE_ID cruft
| -rw-r--r-- | libavcodec/avcodec.h | 10 | ||||
| -rw-r--r-- | libavcodec/options_table.h | 3 | ||||
| -rw-r--r-- | libavcodec/version.h | 3 |
3 files changed, 0 insertions, 16 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 414b35b923..2b79d0b116 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -1501,16 +1501,6 @@ typedef struct AVCodecContext { */ int inter_quant_bias; -#if FF_API_COLOR_TABLE_ID - /** - * color table ID - * - encoding: unused - * - decoding: Which clrtable should be used for 8bit RGB images. - * Tables have to be stored somewhere. FIXME - */ - attribute_deprecated int color_table_id; -#endif - /** * slice flags * - encoding: unused diff --git a/libavcodec/options_table.h b/libavcodec/options_table.h index 937325d479..afb6edaee1 100644 --- a/libavcodec/options_table.h +++ b/libavcodec/options_table.h @@ -263,9 +263,6 @@ static const AVOption options[]={ {"me_range", "limit motion vectors range (1023 for DivX player)", OFFSET(me_range), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX, V|E}, {"ibias", "intra quant bias", OFFSET(intra_quant_bias), AV_OPT_TYPE_INT, {.i64 = FF_DEFAULT_QUANT_BIAS }, INT_MIN, INT_MAX, V|E}, {"pbias", "inter quant bias", OFFSET(inter_quant_bias), AV_OPT_TYPE_INT, {.i64 = FF_DEFAULT_QUANT_BIAS }, INT_MIN, INT_MAX, V|E}, -#if FF_API_COLOR_TABLE_ID -{"color_table_id", NULL, OFFSET(color_table_id), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX}, -#endif {"global_quality", NULL, OFFSET(global_quality), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX, V|A|E}, {"coder", NULL, OFFSET(coder_type), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX, V|E, "coder"}, {"vlc", "variable length coder / Huffman coder", 0, AV_OPT_TYPE_CONST, {.i64 = FF_CODER_TYPE_VLC }, INT_MIN, INT_MAX, V|E, "coder"}, diff --git a/libavcodec/version.h b/libavcodec/version.h index 31452f7eee..8423b7249d 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_COLOR_TABLE_ID -#define FF_API_COLOR_TABLE_ID (LIBAVCODEC_VERSION_MAJOR < 55) -#endif #ifndef FF_API_INTER_THRESHOLD #define FF_API_INTER_THRESHOLD (LIBAVCODEC_VERSION_MAJOR < 55) #endif |