From 800c289a6693c5651072f13a0aafb634ba75ffc7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A5ns=20Rullg=C3=A5rd?= Date: Tue, 26 Feb 2008 20:37:59 +0000 Subject: less preprocessor magic in version number macros Originally committed as revision 12246 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavutil/avutil.h | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) (limited to 'libavutil') diff --git a/libavutil/avutil.h b/libavutil/avutil.h index b08d98d..3d2bd4b 100644 --- a/libavutil/avutil.h +++ b/libavutil/avutil.h @@ -30,16 +30,20 @@ #define AV_STRINGIFY(s) AV_TOSTRING(s) #define AV_TOSTRING(s) #s -#define AV_VERSION_INT_3(a, b, c) (a<<16 | b<<8 | c) -#define AV_VERSION_INT(x) AV_VERSION_INT_3(x) - -#define AV_VERSION_3(a, b, c) a ##.## b ##.## c -#define AV_VERSION(x) AV_VERSION_3(x) - -#define LIBAVUTIL_VERSION_TRIPLET 49,6,0 - -#define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_TRIPLET) -#define LIBAVUTIL_VERSION AV_VERSION(LIBAVUTIL_VERSION_TRIPLET) +#define AV_VERSION_INT(a, b, c) (a<<16 | b<<8 | c) +#define AV_VERSION_DOT(a, b, c) a ##.## b ##.## c +#define AV_VERSION(a, b, c) AV_VERSION_DOT(a, b, c) + +#define LIBAVUTIL_VERSION_MAJOR 49 +#define LIBAVUTIL_VERSION_MINOR 6 +#define LIBAVUTIL_VERSION_MICRO 0 + +#define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \ + LIBAVUTIL_VERSION_MINOR, \ + LIBAVUTIL_VERSION_MICRO) +#define LIBAVUTIL_VERSION AV_VERSION(LIBAVUTIL_VERSION_MAJOR, \ + LIBAVUTIL_VERSION_MINOR, \ + LIBAVUTIL_VERSION_MICRO) #define LIBAVUTIL_BUILD LIBAVUTIL_VERSION_INT #define LIBAVUTIL_IDENT "Lavu" AV_STRINGIFY(LIBAVUTIL_VERSION) -- cgit v1.1