diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-03-13 10:57:00 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-03-13 10:57:00 +0100 |
| commit | a8c077732598dffe6cf32fc5d6eb8adcffd5c1f7 (patch) | |
| tree | 392299524722acde36dc5091fd64cdc8a0056a55 /libavcodec/version.h | |
| parent | bbaa4432e2bf698f834e6cf95c331f6df5db7c75 (diff) | |
| download | ffmpeg-a8c077732598dffe6cf32fc5d6eb8adcffd5c1f7.tar.gz | |
Revert "Merge commit '0517c9e098092709397cc522c59fa63c83cc81be'" bring the old audio resampling API back
This reverts commit d3edc65dd1e5b5d4246fcb8bcd216eb558bab7d4, reversing
changes made to 150de78d7c9cee65b4095832b25ae353e0d7c7af.
Conflicts:
libavcodec/version.h
It seems there are several applications still using it
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/version.h')
| -rw-r--r-- | libavcodec/version.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/libavcodec/version.h b/libavcodec/version.h index 3fa2d51785..4825161e42 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -73,6 +73,9 @@ #ifndef FF_API_CODEC_ID #define FF_API_CODEC_ID (LIBAVCODEC_VERSION_MAJOR < 56) #endif +#ifndef FF_API_AVCODEC_RESAMPLE +#define FF_API_AVCODEC_RESAMPLE (LIBAVCODEC_VERSION_MAJOR < 56) +#endif #ifndef FF_API_MMI #define FF_API_MMI (LIBAVCODEC_VERSION_MAJOR < 55) #endif |