diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-03-24 23:20:46 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-03-24 23:20:46 +0100 |
| commit | 15890d67c1ae463c72646a5d12ab417e6b45986e (patch) | |
| tree | 9b696b713363601b18d52411aec9cb2afd1abd09 /libswresample | |
| parent | 947215a261d05b082d7f6baadad24ed4bd666a4c (diff) | |
| download | ffmpeg-15890d67c1ae463c72646a5d12ab417e6b45986e.tar.gz | |
swr: drop SWR_CH_MAX with the next major ABI bump
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswresample')
| -rw-r--r-- | libswresample/swresample.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libswresample/swresample.h b/libswresample/swresample.h index 2d24f952e0..f860f7cdd6 100644 --- a/libswresample/swresample.h +++ b/libswresample/swresample.h @@ -37,7 +37,9 @@ LIBSWRESAMPLE_VERSION_MINOR, \ LIBSWRESAMPLE_VERSION_MICRO) +#if LIBSWRESAMPLE_VERSION_MAJOR < 1 #define SWR_CH_MAX 32 ///< Maximum number of channels +#endif #define SWR_FLAG_RESAMPLE 1 ///< Force resampling even if equal sample rate //TODO use int resample ? |