diff options
| author | Anton Khirnov <anton@khirnov.net> | 2012-01-22 10:56:42 +0100 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2012-01-27 10:38:34 +0100 |
| commit | 99ace37e68c122f0b051ac2937535960238b38f4 (patch) | |
| tree | 57a8ce9d263bfbc0e3b7a47f84bd577e1ecf3c2e /libavcodec | |
| parent | 96e9b96fcd394dcaeebf7da3f94b0b7de663ecec (diff) | |
| download | ffmpeg-99ace37e68c122f0b051ac2937535960238b38f4.tar.gz | |
lavc: remove disabled FF_API_MJPEG_GLOBAL_OPTS cruft.
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/avcodec.h | 11 | ||||
| -rw-r--r-- | libavcodec/mjpegdec.c | 4 | ||||
| -rw-r--r-- | libavcodec/options.c | 3 | ||||
| -rw-r--r-- | libavcodec/version.h | 3 |
4 files changed, 0 insertions, 21 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 0455b7b03a..d844170c16 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -588,17 +588,6 @@ typedef struct RcOverride{ #define CODEC_FLAG2_LOCAL_HEADER 0x00000008 ///< Place global headers at every keyframe instead of in extradata. #define CODEC_FLAG2_SKIP_RD 0x00004000 ///< RD optimal MB level residual skipping #define CODEC_FLAG2_CHUNKS 0x00008000 ///< Input bitstream might be truncated at a packet boundaries instead of only at frame boundaries. -/** - * @defgroup deprecated_flags Deprecated codec flags - * Use corresponding private codec options instead. - * @{ - */ -#if FF_API_MJPEG_GLOBAL_OPTS -#define CODEC_FLAG_EXTERN_HUFF 0x1000 ///< Use external Huffman table (for MJPEG). -#endif -/** - * @} - */ /* Unsupported options : * Syntax Arithmetic coding (SAC) diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c index 2ae502ddeb..d6ed43bbaa 100644 --- a/libavcodec/mjpegdec.c +++ b/libavcodec/mjpegdec.c @@ -101,10 +101,6 @@ av_cold int ff_mjpeg_decode_init(AVCodecContext *avctx) build_basic_mjpeg_vlc(s); -#if FF_API_MJPEG_GLOBAL_OPTS - if (avctx->flags & CODEC_FLAG_EXTERN_HUFF) - s->extern_huff = 1; -#endif if (s->extern_huff) { av_log(avctx, AV_LOG_INFO, "mjpeg: using external huffman table\n"); init_get_bits(&s->gb, avctx->extradata, avctx->extradata_size * 8); diff --git a/libavcodec/options.c b/libavcodec/options.c index 10041812a9..659f19868a 100644 --- a/libavcodec/options.c +++ b/libavcodec/options.c @@ -87,9 +87,6 @@ static const AVOption options[]={ {"input_preserved", NULL, 0, AV_OPT_TYPE_CONST, {.dbl = CODEC_FLAG_INPUT_PRESERVED }, INT_MIN, INT_MAX, 0, "flags"}, {"pass1", "use internal 2pass ratecontrol in first pass mode", 0, AV_OPT_TYPE_CONST, {.dbl = CODEC_FLAG_PASS1 }, INT_MIN, INT_MAX, 0, "flags"}, {"pass2", "use internal 2pass ratecontrol in second pass mode", 0, AV_OPT_TYPE_CONST, {.dbl = CODEC_FLAG_PASS2 }, INT_MIN, INT_MAX, 0, "flags"}, -#if FF_API_MJPEG_GLOBAL_OPTS -{"extern_huff", "use external huffman table (for mjpeg)", 0, AV_OPT_TYPE_CONST, {.dbl = CODEC_FLAG_EXTERN_HUFF }, INT_MIN, INT_MAX, 0, "flags"}, -#endif {"gray", "only decode/encode grayscale", 0, AV_OPT_TYPE_CONST, {.dbl = CODEC_FLAG_GRAY }, INT_MIN, INT_MAX, V|E|D, "flags"}, {"emu_edge", "don't draw edges", 0, AV_OPT_TYPE_CONST, {.dbl = CODEC_FLAG_EMU_EDGE }, INT_MIN, INT_MAX, 0, "flags"}, {"psnr", "error[?] variables will be set during encoding", 0, AV_OPT_TYPE_CONST, {.dbl = CODEC_FLAG_PSNR }, INT_MIN, INT_MAX, V|E, "flags"}, diff --git a/libavcodec/version.h b/libavcodec/version.h index 9eee5c6cf7..150c465d55 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -41,9 +41,6 @@ #ifndef FF_API_REQUEST_CHANNELS #define FF_API_REQUEST_CHANNELS (LIBAVCODEC_VERSION_MAJOR < 55) #endif -#ifndef FF_API_MJPEG_GLOBAL_OPTS -#define FF_API_MJPEG_GLOBAL_OPTS (LIBAVCODEC_VERSION_MAJOR < 54) -#endif #ifndef FF_API_GET_ALPHA_INFO #define FF_API_GET_ALPHA_INFO (LIBAVCODEC_VERSION_MAJOR < 54) #endif |