diff options
| author | Anton Khirnov <anton@khirnov.net> | 2014-07-03 19:01:59 +0000 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2014-07-09 13:37:18 +0000 |
| commit | d5cf5afabbf43f00283e70b12afbe1da030d85b6 (patch) | |
| tree | f90930aaee18f386ddc35928d9fcf8186382efd0 /libavcodec/adx.c | |
| parent | f6ee61fb05482c617f5deee29a190d8ff483b3d1 (diff) | |
| download | ffmpeg-streaming-d5cf5afabbf43f00283e70b12afbe1da030d85b6.zip ffmpeg-streaming-d5cf5afabbf43f00283e70b12afbe1da030d85b6.tar.gz | |
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.
Diffstat (limited to 'libavcodec/adx.c')
| -rw-r--r-- | libavcodec/adx.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/libavcodec/adx.c b/libavcodec/adx.c index a9cf4ff..4d412d5 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 |
