diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-07-09 22:37:42 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-07-09 22:38:13 +0200 |
| commit | e932ae5940562ae0a183687053a5457a76fd1fa9 (patch) | |
| tree | d60f2db127f068f058a0b44adfeca3d580ba542a /libavcodec/adx.c | |
| parent | 1b58f1376132026a7633fea253f0ed67a8392343 (diff) | |
| parent | d5cf5afabbf43f00283e70b12afbe1da030d85b6 (diff) | |
| download | ffmpeg-e932ae5940562ae0a183687053a5457a76fd1fa9.tar.gz | |
Merge commit 'd5cf5afabbf43f00283e70b12afbe1da030d85b6'
* commit 'd5cf5afabbf43f00283e70b12afbe1da030d85b6':
adxdec: get rid of an avpriv function
Merged-by: Michael Niedermayer <michaelni@gmx.at>
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 30e13c0c1c..9c5bedc234 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 |