[FFmpeg-cvslog] swr: fix swresample_version()

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Dec 23 23:26:02 2011 +0100| [320b8d6335548c473deef58f638665c82dda35b4] | committer: Michael Niedermayer

swr: fix swresample_version()

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

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

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

diff --git a/libswresample/swresample.c b/libswresample/swresample.c
index 107ce16..84d0f40 100644
--- a/libswresample/swresample.c
+++ b/libswresample/swresample.c
@@ -73,7 +73,7 @@ static const AVClass av_class = {
 unsigned swresample_version(void)
 {
     av_assert0(LIBSWRESAMPLE_VERSION_MICRO >= 100);
-    return LIBSWRESAMPLE_VERSION_MICRO;
+    return LIBSWRESAMPLE_VERSION_INT;
 }
 
 const char *swresample_configuration(void)
diff --git a/libswresample/swresample.h b/libswresample/swresample.h
index fa85e24..5b9eed9 100644
--- a/libswresample/swresample.h
+++ b/libswresample/swresample.h
@@ -33,6 +33,10 @@
 #define LIBSWRESAMPLE_VERSION_MINOR 5
 #define LIBSWRESAMPLE_VERSION_MICRO 100
 
+#define LIBSWRESAMPLE_VERSION_INT  AV_VERSION_INT(LIBSWRESAMPLE_VERSION_MAJOR, \
+                                                  LIBSWRESAMPLE_VERSION_MINOR, \
+                                                  LIBSWRESAMPLE_VERSION_MICRO)
+
 #define SWR_CH_MAX 16   ///< Maximum number of channels
 
 #define SWR_FLAG_RESAMPLE 1 ///< Force resampling even if equal sample rate