[FFmpeg-cvslog] swr: drop SWR_CH_MAX with the next major ABI bump

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Mar 24 23:20:46 2012 +0100| [15890d67c1ae463c72646a5d12ab417e6b45986e] | committer: Michael Niedermayer

swr: drop SWR_CH_MAX with the next major ABI bump

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=15890d67c1ae463c72646a5d12ab417e6b45986e
---

 libswresample/swresample.h |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/libswresample/swresample.h b/libswresample/swresample.h
index 2d24f95..f860f7c 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 ?