diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-12-23 23:26:02 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-12-23 23:26:02 +0100 |
| commit | 320b8d6335548c473deef58f638665c82dda35b4 (patch) | |
| tree | 8879641e51b757258c5f440c4167f0fa6934cc3d /libswresample | |
| parent | 8ff4fff7741a2febfd52be80cee4aadba9f9d760 (diff) | |
| download | ffmpeg-320b8d6335548c473deef58f638665c82dda35b4.tar.gz | |
swr: fix swresample_version()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswresample')
| -rw-r--r-- | libswresample/swresample.c | 2 | ||||
| -rw-r--r-- | libswresample/swresample.h | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/libswresample/swresample.c b/libswresample/swresample.c index 107ce168af..84d0f40232 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 fa85e24f1f..5b9eed926f 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 |