diff options
| author | Måns Rullgård <mans@mansr.com> | 2008-02-26 20:37:59 +0000 |
|---|---|---|
| committer | Måns Rullgård <mans@mansr.com> | 2008-02-26 20:37:59 +0000 |
| commit | 800c289a6693c5651072f13a0aafb634ba75ffc7 (patch) | |
| tree | cd0722319d2769236f2ec97b617ba3b62fb6c0dd /libavutil | |
| parent | 11fdbc4430785fbed7ce3a9b086e0bcba1690603 (diff) | |
| download | ffmpeg-800c289a6693c5651072f13a0aafb634ba75ffc7.tar.gz | |
less preprocessor magic in version number macros
Originally committed as revision 12246 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavutil')
| -rw-r--r-- | libavutil/avutil.h | 24 |
1 files changed, 14 insertions, 10 deletions
diff --git a/libavutil/avutil.h b/libavutil/avutil.h index b08d98deb9..3d2bd4be28 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) |