diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-10 02:09:13 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-10 02:09:13 +0200 |
| commit | a71fcfad892c4c59a011556f70b998aca1139b37 (patch) | |
| tree | af961a49102589bc3e8ca8ea93d969428f1e05de /libavcodec/adx.h | |
| parent | 329832d779e2c9f2a2aa97c90b6e3eb1aadb8ee8 (diff) | |
| parent | 9325d88eba8038b3e2a4485e473a018410379e2d (diff) | |
| download | ffmpeg-a71fcfad892c4c59a011556f70b998aca1139b37.tar.gz | |
Merge commit '9325d88eba8038b3e2a4485e473a018410379e2d'
* commit '9325d88eba8038b3e2a4485e473a018410379e2d':
lavc: remove obsolete and disabled avpriv functions
Conflicts:
libavcodec/dv_profile.c
libavcodec/dv_profile.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/adx.h')
| -rw-r--r-- | libavcodec/adx.h | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/libavcodec/adx.h b/libavcodec/adx.h index ca59a2dcca..08f749a046 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 */ |