avutil: Move library version related macros to version.h

This is a more sensible place for these macros.

diff --git a/libavcodec/version.h b/libavcodec/version.h
index 9a43e82d6fc96027408682c31159195a2eb15427..73c786dc04e8c64a8e10d1a4343cfe1bb6c4d45b 100644 (file)
--- a/libavcodec/version.h
+++ b/libavcodec/version.h
@@ -26,6 +26,8 @@
  * Libavcodec version macros.
  */
 
+#include "libavutil/version.h"
+
 #define LIBAVCODEC_VERSION_MAJOR 55
 #define LIBAVCODEC_VERSION_MINOR 31
 #define LIBAVCODEC_VERSION_MICRO  0

diff --git a/libavdevice/version.h b/libavdevice/version.h
index 9731606adcfc20db790220d17c6a7c5cdfefc27f..487b4c0046649b20928321fb2ace5ee86780ebab 100644 (file)
--- a/libavdevice/version.h
+++ b/libavdevice/version.h
@@ -25,7 +25,7 @@
  * Libavdevice version macros
  */
 
-#include "libavutil/avutil.h"
+#include "libavutil/version.h"
 
 #define LIBAVDEVICE_VERSION_MAJOR 54
 #define LIBAVDEVICE_VERSION_MINOR  0

diff --git a/libavfilter/version.h b/libavfilter/version.h
index 9f00ffeaf5da9f21061cffa49c6d2eaa4ee55592..f41114b86d67f139074609891470b195170ab31c 100644 (file)
--- a/libavfilter/version.h
+++ b/libavfilter/version.h
@@ -27,7 +27,7 @@
  * Libavfilter version macros
  */
 
-#include "libavutil/avutil.h"
+#include "libavutil/version.h"
 
 #define LIBAVFILTER_VERSION_MAJOR  4
 #define LIBAVFILTER_VERSION_MINOR  0

diff --git a/libavformat/version.h b/libavformat/version.h
index 23a9d67a9174a483eb4c424453c93327d7e8fd01..a170c06358f3f01aa63ac642601519bfca39fa25 100644 (file)
--- a/libavformat/version.h
+++ b/libavformat/version.h
@@ -27,7 +27,7 @@
  * Libavformat version macros
  */
 
-#include "libavutil/avutil.h"
+#include "libavutil/version.h"
 
 #define LIBAVFORMAT_VERSION_MAJOR 55
 #define LIBAVFORMAT_VERSION_MINOR 10

diff --git a/libavresample/version.h b/libavresample/version.h
index 3cc4441d864d06445db052f98e360b6c7677866e..fce5770c62cdb6c4bb8dd42a4765642356b70fb0 100644 (file)
--- a/libavresample/version.h
+++ b/libavresample/version.h
@@ -25,6 +25,8 @@
  * Libavresample version macros.
  */
 
+#include "libavutil/version.h"
+
 #define LIBAVRESAMPLE_VERSION_MAJOR  1
 #define LIBAVRESAMPLE_VERSION_MINOR  1
 #define LIBAVRESAMPLE_VERSION_MICRO  0

diff --git a/libavutil/avutil.h b/libavutil/avutil.h
index 782284d046348f11f8cb4bde4e7852e7d2265eb4..928a0146a1f10b633f48c41d6e640ed95b98c09f 100644 (file)
--- a/libavutil/avutil.h
+++ b/libavutil/avutil.h
@@ -163,23 +163,6 @@
 
 #define AV_PRAGMA(s) _Pragma(#s)
 
-/**
- * @}
- */
-
-/**
- * @defgroup version_utils Library Version Macros
- *
- * Useful to check and match library version in order to maintain
- * backward compatibility.
- *
- * @{
- */
-
-#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)
-
 /**
  * @}
  */

diff --git a/libavutil/utils.c b/libavutil/utils.c
index 9b18c97908d5fb0cb70362c48f9c20dfe273dd51..2bb27de2b19ff3bd4541ccfca34af1890711a4ba 100644 (file)
--- a/libavutil/utils.c
+++ b/libavutil/utils.c
@@ -17,7 +17,7 @@
  */
 
 #include "config.h"
-#include "avutil.h"
+#include "version.h"
 
 /**
  * @file

diff --git a/libavutil/version.h b/libavutil/version.h
index 9e1f2d80efbf5cafa8b8d0d750b90e9b6443d031..cf5cc2fb143a8e1ccba9879d66d98403e5946b1a 100644 (file)
--- a/libavutil/version.h
+++ b/libavutil/version.h
@@ -21,6 +21,23 @@
 
 #include "avutil.h"
 
+/**
+ * @defgroup version_utils Library Version Macros
+ *
+ * Useful to check and match library version in order to maintain
+ * backward compatibility.
+ *
+ * @{
+ */
+
+#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)
+
+/**
+ * @}
+ */
+
 /**
  * @file
  * @ingroup lavu

diff --git a/libswscale/version.h b/libswscale/version.h
index 54836739c09e41bc378ef57bf8be33e4893e3140..0f32c7ab03fefce681f04f9500cab46ec546f9f1 100644 (file)
--- a/libswscale/version.h
+++ b/libswscale/version.h
@@ -24,7 +24,7 @@
  * swscale version macros
  */
 
-#include "libavutil/avutil.h"
+#include "libavutil/version.h"
 
 #define LIBSWSCALE_VERSION_MAJOR 2
 #define LIBSWSCALE_VERSION_MINOR 1