diff options
| author | Måns Rullgård <mans@mansr.com> | 2008-02-19 22:50:28 +0000 |
|---|---|---|
| committer | Måns Rullgård <mans@mansr.com> | 2008-02-19 22:50:28 +0000 |
| commit | e97ac1e6f5dc3a8ba2e7dc7519a6f8fb356b8a4d (patch) | |
| tree | 91704075078c36e174778d909394a3b1f3ce42f5 | |
| parent | cea9642014e833799eca40db03530ed0002f99d8 (diff) | |
| download | ffmpeg-e97ac1e6f5dc3a8ba2e7dc7519a6f8fb356b8a4d.tar.gz | |
Clean up lib* version definitions
Updating version numbers now requires changing only one place.
Originally committed as revision 12154 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rwxr-xr-x | configure | 2 | ||||
| -rw-r--r-- | libavcodec/avcodec.h | 6 | ||||
| -rw-r--r-- | libavdevice/avdevice.h | 6 | ||||
| -rw-r--r-- | libavformat/avformat.h | 6 | ||||
| -rw-r--r-- | libavutil/avutil.h | 12 | ||||
| -rw-r--r-- | libpostproc/postprocess.h | 6 |
6 files changed, 27 insertions, 11 deletions
@@ -2005,7 +2005,7 @@ fi get_version(){ name=$1 file=$source_path/$2 - grep "#define ${name}_VERSION " "$file" | sed 's/[^0-9\.]//g' + grep "#define ${name}_VERSION_TRIPLET " "$file" | sed 's/[^0-9,]//g' | tr , . } sws_version=$(get_version LIBSWSCALE libswscale/swscale.h) diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 1fc0b233e3..8870fded3f 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -30,8 +30,10 @@ #include "avutil.h" #include <sys/types.h> /* size_t */ -#define LIBAVCODEC_VERSION_INT ((51<<16)+(50<<8)+1) -#define LIBAVCODEC_VERSION 51.50.1 +#define LIBAVCODEC_VERSION_TRIPLET 51,50,1 + +#define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_TRIPLET) +#define LIBAVCODEC_VERSION AV_VERSION(LIBAVCODEC_VERSION_TRIPLET) #define LIBAVCODEC_BUILD LIBAVCODEC_VERSION_INT #define LIBAVCODEC_IDENT "Lavc" AV_STRINGIFY(LIBAVCODEC_VERSION) diff --git a/libavdevice/avdevice.h b/libavdevice/avdevice.h index afab46b1f5..15d6ee5b0b 100644 --- a/libavdevice/avdevice.h +++ b/libavdevice/avdevice.h @@ -19,8 +19,10 @@ #ifndef FFMPEG_AVDEVICE_H #define FFMPEG_AVDEVICE_H -#define LIBAVDEVICE_VERSION_INT ((52<<16)+(0<<8)+0) -#define LIBAVDEVICE_VERSION 52.0.0 +#define LIBAVDEVICE_VERSION_TRIPLET 52,0,0 + +#define LIBAVDEVICE_VERSION_INT AV_VERSION_INT(LIBAVDEVICE_VERSION_TRIPLET) +#define LIBAVDEVICE_VERSION AV_VERSION(LIBAVDEVICE_VERSION_TRIPLET) #define LIBAVDEVICE_BUILD LIBAVDEVICE_VERSION_INT /** diff --git a/libavformat/avformat.h b/libavformat/avformat.h index b28014895c..06396eebff 100644 --- a/libavformat/avformat.h +++ b/libavformat/avformat.h @@ -21,8 +21,10 @@ #ifndef FFMPEG_AVFORMAT_H #define FFMPEG_AVFORMAT_H -#define LIBAVFORMAT_VERSION_INT ((52<<16)+(7<<8)+0) -#define LIBAVFORMAT_VERSION 52.7.0 +#define LIBAVFORMAT_VERSION_TRIPLET 52,7,0 + +#define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_TRIPLET) +#define LIBAVFORMAT_VERSION AV_VERSION(LIBAVFORMAT_VERSION_TRIPLET) #define LIBAVFORMAT_BUILD LIBAVFORMAT_VERSION_INT #define LIBAVFORMAT_IDENT "Lavf" AV_STRINGIFY(LIBAVFORMAT_VERSION) diff --git a/libavutil/avutil.h b/libavutil/avutil.h index 7e37026eb3..b08d98deb9 100644 --- a/libavutil/avutil.h +++ b/libavutil/avutil.h @@ -30,8 +30,16 @@ #define AV_STRINGIFY(s) AV_TOSTRING(s) #define AV_TOSTRING(s) #s -#define LIBAVUTIL_VERSION_INT ((49<<16)+(6<<8)+0) -#define LIBAVUTIL_VERSION 49.6.0 +#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 LIBAVUTIL_BUILD LIBAVUTIL_VERSION_INT #define LIBAVUTIL_IDENT "Lavu" AV_STRINGIFY(LIBAVUTIL_VERSION) diff --git a/libpostproc/postprocess.h b/libpostproc/postprocess.h index 4782bac648..1803959cd3 100644 --- a/libpostproc/postprocess.h +++ b/libpostproc/postprocess.h @@ -27,8 +27,10 @@ * external api for the pp stuff */ -#define LIBPOSTPROC_VERSION_INT ((51<<16)+(1<<8)+0) -#define LIBPOSTPROC_VERSION 51.1.0 +#define LIBPOSTPROC_VERSION_TRIPLET 51,1,0 + +#define LIBPOSTPROC_VERSION_INT AV_VERSION_INT(LIBPOSTPROC_VERSION_TRIPLET) +#define LIBPOSTPROC_VERSION AV_VERSION(LIBPOSTPROC_VERSION_TRIPLET) #define LIBPOSTPROC_BUILD LIBPOSTPROC_VERSION_INT #define LIBPOSTPROC_IDENT "postproc" AV_STRINGIFY(LIBPOSTPROC_VERSION) |