Clean up lib* version definitions

Updating version numbers now requires changing only one place.

git-svn-id: file:///var/local/repositories/ffmpeg/trunk@12154 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b

diff --git a/configure b/configure
index 194808feeeedf5a58d6c1f382166d5eec539e77e..be46e5922cd501a6fffaf401fe5d535258482763 100755 (executable)
--- a/configure
+++ b/configure
@@ -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 1fc0b233e3357e93608fd1209b947031e4be1a3e..8870fded3fe29c017e1becaeee37e5e5fbe98383 100644 (file)
--- 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 afab46b1f5122dd313b6773cab7de4f9622ae335..15d6ee5b0b0b5b9344abdd18bd3fa92773e0056c 100644 (file)
--- 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 b28014895c3f3dbf26c97d2385d14855a2db42ac..06396eebff0ad72c16fbf0bb5ee5cf20b52d6f99 100644 (file)
--- 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 7e37026eb3a395fe9ca548b4fa0bd0282e248d1a..b08d98deb9fde7df6d7568b597b3bec11ece149c 100644 (file)
--- 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 4782bac648a708f19fcedf83f7feb225927902b9..1803959cd366a95011aa7c9f145f8abbc8a91850 100644 (file)
--- 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)