diff options
author | Anton Khirnov <anton@khirnov.net> | 2014-08-07 00:02:11 +0400 |
---|---|---|
committer | Anton Khirnov <anton@khirnov.net> | 2014-08-09 20:59:34 +0400 |
commit | 9325d88eba8038b3e2a4485e473a018410379e2d (patch) | |
tree | 22c127f4a4730cc8d96a382b8a30875e540f5973 | |
parent | 24c788f4878729a42150581d7ed7e9a11daf874d (diff) |
lavc: remove obsolete and disabled avpriv functions
-rw-r--r-- | libavcodec/adx.c | 8 | ||||
-rw-r--r-- | libavcodec/adx.h | 5 | ||||
-rw-r--r-- | libavcodec/dv_profile.c | 13 | ||||
-rw-r--r-- | libavcodec/dv_profile.h | 6 | ||||
-rw-r--r-- | libavcodec/flac.c | 8 | ||||
-rw-r--r-- | libavcodec/flac.h | 5 |
6 files changed, 0 insertions, 45 deletions
diff --git a/libavcodec/adx.c b/libavcodec/adx.c index 4d412d56d3..d941d7b89c 100644 --- a/libavcodec/adx.c +++ b/libavcodec/adx.c @@ -80,11 +80,3 @@ int ff_adx_decode_header(AVCodecContext *avctx, const uint8_t *buf, *header_size = offset; return 0; } - -#if LIBAVCODEC_VERSION_MAJOR < 56 -int avpriv_adx_decode_header(AVCodecContext *avctx, const uint8_t *buf, - int bufsize, int *header_size, int *coeff) -{ - return ff_adx_decode_header(avctx, buf, bufsize, header_size, coeff); -} -#endif diff --git a/libavcodec/adx.h b/libavcodec/adx.h index 9328111012..9ae84dcec1 100644 --- a/libavcodec/adx.h +++ b/libavcodec/adx.h @@ -77,9 +77,4 @@ void ff_adx_calculate_coeffs(int cutoff, int sample_rate, int bits, int *coeff); int ff_adx_decode_header(AVCodecContext *avctx, const uint8_t *buf, int bufsize, int *header_size, int *coeff); -#if LIBAVCODEC_VERSION_MAJOR < 56 -int avpriv_adx_decode_header(AVCodecContext *avctx, const uint8_t *buf, - int bufsize, int *header_size, int *coeff); -#endif - #endif /* AVCODEC_ADX_H */ diff --git a/libavcodec/dv_profile.c b/libavcodec/dv_profile.c index 686632d89e..f3cf86f2be 100644 --- a/libavcodec/dv_profile.c +++ b/libavcodec/dv_profile.c @@ -308,16 +308,3 @@ const AVDVProfile *av_dv_codec_profile(int width, int height, return NULL; } - -#if LIBAVCODEC_VERSION_MAJOR < 56 -const AVDVProfile *avpriv_dv_frame_profile(const AVDVProfile *sys, - const uint8_t* frame, unsigned buf_size) -{ - return av_dv_frame_profile(sys, frame, buf_size); -} - -const AVDVProfile *avpriv_dv_codec_profile(AVCodecContext *codec) -{ - return av_dv_codec_profile(codec->width, codec->height, codec->pix_fmt); -} -#endif diff --git a/libavcodec/dv_profile.h b/libavcodec/dv_profile.h index f2f5ce9b9b..5ad7b4f649 100644 --- a/libavcodec/dv_profile.h +++ b/libavcodec/dv_profile.h @@ -53,12 +53,6 @@ typedef struct AVDVProfile { const uint8_t (*audio_shuffle)[9]; /* PCM shuffling table */ } AVDVProfile; -#if LIBAVCODEC_VERSION_MAJOR < 56 -const AVDVProfile *avpriv_dv_frame_profile(const AVDVProfile *sys, - const uint8_t* frame, unsigned buf_size); -const AVDVProfile *avpriv_dv_codec_profile(AVCodecContext* codec); -#endif - /** * Get a DV profile for the provided compressed frame. * diff --git a/libavcodec/flac.c b/libavcodec/flac.c index cd1a6ab87d..ec0cb6f0b9 100644 --- a/libavcodec/flac.c +++ b/libavcodec/flac.c @@ -236,11 +236,3 @@ void avpriv_flac_parse_streaminfo(AVCodecContext *avctx, struct FLACStreaminfo * skip_bits_long(&gb, 64); /* md5 sum */ skip_bits_long(&gb, 64); /* md5 sum */ } - -#if LIBAVCODEC_VERSION_MAJOR < 56 -void avpriv_flac_parse_block_header(const uint8_t *block_header, - int *last, int *type, int *size) -{ - flac_parse_block_header(block_header, last, type, size); -} -#endif diff --git a/libavcodec/flac.h b/libavcodec/flac.h index fbd34a18b1..9baa330bf9 100644 --- a/libavcodec/flac.h +++ b/libavcodec/flac.h @@ -110,11 +110,6 @@ int avpriv_flac_is_extradata_valid(AVCodecContext *avctx, enum FLACExtradataFormat *format, uint8_t **streaminfo_start); -#if LIBAVCODEC_VERSION_MAJOR < 56 -void avpriv_flac_parse_block_header(const uint8_t *block_header, - int *last, int *type, int *size); -#endif - /** * Calculate an estimate for the maximum frame size based on verbatim mode. * @param blocksize block size, in samples |