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.h | |
| parent | 1b58f1376132026a7633fea253f0ed67a8392343 (diff) | |
| parent | d5cf5afabbf43f00283e70b12afbe1da030d85b6 (diff) | |
Merge commit 'd5cf5afabbf43f00283e70b12afbe1da030d85b6'
* commit 'd5cf5afabbf43f00283e70b12afbe1da030d85b6':
adxdec: get rid of an avpriv function
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/adx.h')
| -rw-r--r-- | libavcodec/adx.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/libavcodec/adx.h b/libavcodec/adx.h index b28d09a32e..ca59a2dcca 100644 --- a/libavcodec/adx.h +++ b/libavcodec/adx.h @@ -74,7 +74,12 @@ void ff_adx_calculate_coeffs(int cutoff, int sample_rate, int bits, int *coeff); * @param[out] coeff 2 LPC coefficients, can be NULL * @return data offset or negative error code if header is invalid */ +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 */ |