From d5cf5afabbf43f00283e70b12afbe1da030d85b6 Mon Sep 17 00:00:00 2001 From: Anton Khirnov Date: Thu, 3 Jul 2014 19:01:59 +0000 Subject: adxdec: get rid of an avpriv function The only thing the demuxer needs is the sample rate to set the timebase, which can be simply read with AV_RB32. --- libavcodec/adx.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'libavcodec/adx.c') diff --git a/libavcodec/adx.c b/libavcodec/adx.c index a9cf4ffd09..4d412d56d3 100644 --- a/libavcodec/adx.c +++ b/libavcodec/adx.c @@ -35,8 +35,8 @@ void ff_adx_calculate_coeffs(int cutoff, int sample_rate, int bits, int *coeff) coeff[1] = lrintf(-(c * c) * (1 << bits)); } -int avpriv_adx_decode_header(AVCodecContext *avctx, const uint8_t *buf, - int bufsize, int *header_size, int *coeff) +int ff_adx_decode_header(AVCodecContext *avctx, const uint8_t *buf, + int bufsize, int *header_size, int *coeff) { int offset, cutoff; @@ -80,3 +80,11 @@ int avpriv_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 -- cgit v1.2.3