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.c | |
| parent | 329832d779e2c9f2a2aa97c90b6e3eb1aadb8ee8 (diff) | |
| parent | 9325d88eba8038b3e2a4485e473a018410379e2d (diff) | |
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.c')
| -rw-r--r-- | libavcodec/adx.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/libavcodec/adx.c b/libavcodec/adx.c index 9c5bedc234..cd88b16660 100644 --- a/libavcodec/adx.c +++ b/libavcodec/adx.c @@ -80,11 +80,3 @@ int ff_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 |