From ac84395d6a31fc990fd28895bcdb5789de7606b8 Mon Sep 17 00:00:00 2001 From: Anton Khirnov Date: Sun, 22 Jan 2012 10:56:42 +0100 Subject: [PATCH] lavc: remove disabled FF_API_PARSE_FRAME cruft. --- libavcodec/avcodec.h | 14 -------------- libavcodec/mpegaudiodec.c | 21 --------------------- libavcodec/mpegaudiodec_float.c | 16 ---------------- libavcodec/options.c | 3 --- libavcodec/version.h | 3 --- 5 files changed, 57 deletions(-) diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 6ba2ac982a..a9bce7a746 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -603,10 +603,6 @@ typedef struct RcOverride{ * assume the buffer was allocated by avcodec_default_get_buffer. */ #define CODEC_CAP_DR1 0x0002 -#if FF_API_PARSE_FRAME -/* If 'parse_only' field is true, then avcodec_parse_frame() can be used. */ -#define CODEC_CAP_PARSE_ONLY 0x0004 -#endif #define CODEC_CAP_TRUNCATED 0x0008 /* Codec can export data for HW decoding (XvMC). */ #define CODEC_CAP_HWACCEL 0x0010 @@ -1610,16 +1606,6 @@ typedef struct AVCodecContext { */ int block_align; -#if FF_API_PARSE_FRAME - /** - * If true, only parsing is done. The frame data is returned. - * Only MPEG audio decoders support this now. - * - encoding: unused - * - decoding: Set by user - */ - attribute_deprecated int parse_only; -#endif - /** * 0-> h263 quant 1-> mpeg quant * - encoding: Set by user. diff --git a/libavcodec/mpegaudiodec.c b/libavcodec/mpegaudiodec.c index a83b1621fd..4ea5146ed6 100644 --- a/libavcodec/mpegaudiodec.c +++ b/libavcodec/mpegaudiodec.c @@ -1727,11 +1727,6 @@ static int decode_frame_adu(AVCodecContext *avctx, void *data, s->frame_size = len; -#if FF_API_PARSE_FRAME - if (avctx->parse_only) - out_size = buf_size; - else -#endif out_size = mp_decode_frame(s, NULL, buf, buf_size); *got_frame_ptr = 1; @@ -1979,11 +1974,7 @@ AVCodec ff_mp1_decoder = { .priv_data_size = sizeof(MPADecodeContext), .init = decode_init, .decode = decode_frame, -#if FF_API_PARSE_FRAME - .capabilities = CODEC_CAP_PARSE_ONLY | CODEC_CAP_DR1, -#else .capabilities = CODEC_CAP_DR1, -#endif .flush = flush, .long_name = NULL_IF_CONFIG_SMALL("MP1 (MPEG audio layer 1)"), }; @@ -1996,11 +1987,7 @@ AVCodec ff_mp2_decoder = { .priv_data_size = sizeof(MPADecodeContext), .init = decode_init, .decode = decode_frame, -#if FF_API_PARSE_FRAME - .capabilities = CODEC_CAP_PARSE_ONLY | CODEC_CAP_DR1, -#else .capabilities = CODEC_CAP_DR1, -#endif .flush = flush, .long_name = NULL_IF_CONFIG_SMALL("MP2 (MPEG audio layer 2)"), }; @@ -2013,11 +2000,7 @@ AVCodec ff_mp3_decoder = { .priv_data_size = sizeof(MPADecodeContext), .init = decode_init, .decode = decode_frame, -#if FF_API_PARSE_FRAME - .capabilities = CODEC_CAP_PARSE_ONLY | CODEC_CAP_DR1, -#else .capabilities = CODEC_CAP_DR1, -#endif .flush = flush, .long_name = NULL_IF_CONFIG_SMALL("MP3 (MPEG audio layer 3)"), }; @@ -2030,11 +2013,7 @@ AVCodec ff_mp3adu_decoder = { .priv_data_size = sizeof(MPADecodeContext), .init = decode_init, .decode = decode_frame_adu, -#if FF_API_PARSE_FRAME - .capabilities = CODEC_CAP_PARSE_ONLY | CODEC_CAP_DR1, -#else .capabilities = CODEC_CAP_DR1, -#endif .flush = flush, .long_name = NULL_IF_CONFIG_SMALL("ADU (Application Data Unit) MP3 (MPEG audio layer 3)"), }; diff --git a/libavcodec/mpegaudiodec_float.c b/libavcodec/mpegaudiodec_float.c index 02c83afb4c..dd37bbc26c 100644 --- a/libavcodec/mpegaudiodec_float.c +++ b/libavcodec/mpegaudiodec_float.c @@ -30,11 +30,7 @@ AVCodec ff_mp1float_decoder = { .priv_data_size = sizeof(MPADecodeContext), .init = decode_init, .decode = decode_frame, -#if FF_API_PARSE_FRAME - .capabilities = CODEC_CAP_PARSE_ONLY | CODEC_CAP_DR1, -#else .capabilities = CODEC_CAP_DR1, -#endif .flush = flush, .long_name = NULL_IF_CONFIG_SMALL("MP1 (MPEG audio layer 1)"), }; @@ -47,11 +43,7 @@ AVCodec ff_mp2float_decoder = { .priv_data_size = sizeof(MPADecodeContext), .init = decode_init, .decode = decode_frame, -#if FF_API_PARSE_FRAME - .capabilities = CODEC_CAP_PARSE_ONLY | CODEC_CAP_DR1, -#else .capabilities = CODEC_CAP_DR1, -#endif .flush = flush, .long_name = NULL_IF_CONFIG_SMALL("MP2 (MPEG audio layer 2)"), }; @@ -64,11 +56,7 @@ AVCodec ff_mp3float_decoder = { .priv_data_size = sizeof(MPADecodeContext), .init = decode_init, .decode = decode_frame, -#if FF_API_PARSE_FRAME - .capabilities = CODEC_CAP_PARSE_ONLY | CODEC_CAP_DR1, -#else .capabilities = CODEC_CAP_DR1, -#endif .flush = flush, .long_name = NULL_IF_CONFIG_SMALL("MP3 (MPEG audio layer 3)"), }; @@ -81,11 +69,7 @@ AVCodec ff_mp3adufloat_decoder = { .priv_data_size = sizeof(MPADecodeContext), .init = decode_init, .decode = decode_frame_adu, -#if FF_API_PARSE_FRAME - .capabilities = CODEC_CAP_PARSE_ONLY | CODEC_CAP_DR1, -#else .capabilities = CODEC_CAP_DR1, -#endif .flush = flush, .long_name = NULL_IF_CONFIG_SMALL("ADU (Application Data Unit) MP3 (MPEG audio layer 3)"), }; diff --git a/libavcodec/options.c b/libavcodec/options.c index 659f19868a..c416b4aa4f 100644 --- a/libavcodec/options.c +++ b/libavcodec/options.c @@ -181,9 +181,6 @@ static const AVOption options[]={ {"explode", "abort decoding on minor error detection", 0, AV_OPT_TYPE_CONST, {.dbl = AV_EF_EXPLODE }, INT_MIN, INT_MAX, V|D, "err_detect"}, {"has_b_frames", NULL, OFFSET(has_b_frames), AV_OPT_TYPE_INT, {.dbl = DEFAULT }, INT_MIN, INT_MAX}, {"block_align", NULL, OFFSET(block_align), AV_OPT_TYPE_INT, {.dbl = DEFAULT }, INT_MIN, INT_MAX}, -#if FF_API_PARSE_FRAME -{"parse_only", NULL, OFFSET(parse_only), AV_OPT_TYPE_INT, {.dbl = DEFAULT }, INT_MIN, INT_MAX}, -#endif {"mpeg_quant", "use MPEG quantizers instead of H.263", OFFSET(mpeg_quant), AV_OPT_TYPE_INT, {.dbl = DEFAULT }, INT_MIN, INT_MAX, V|E}, {"stats_out", NULL, OFFSET(stats_out), AV_OPT_TYPE_STRING, {.str = NULL}, CHAR_MIN, CHAR_MAX}, {"stats_in", NULL, OFFSET(stats_in), AV_OPT_TYPE_STRING, {.str = NULL}, CHAR_MIN, CHAR_MAX}, diff --git a/libavcodec/version.h b/libavcodec/version.h index 230f53446f..fc3c0c8652 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_PARSE_FRAME -#define FF_API_PARSE_FRAME (LIBAVCODEC_VERSION_MAJOR < 54) -#endif #ifndef FF_API_INTERNAL_CONTEXT #define FF_API_INTERNAL_CONTEXT (LIBAVCODEC_VERSION_MAJOR < 54) #endif