From b83d1ee3b41cfe8357836e2582104db2f3364cb0 Mon Sep 17 00:00:00 2001
From: Diego Biurrun <diego@biurrun.de>
Date: Wed, 25 Dec 2013 17:16:05 +0100
Subject: avutil: Move library version related macros to version.h

This is a more sensible place for these macros.
---
 libavutil/avutil.h  | 17 -----------------
 libavutil/utils.c   |  2 +-
 libavutil/version.h | 17 +++++++++++++++++
 3 files changed, 18 insertions(+), 18 deletions(-)

(limited to 'libavutil')

diff --git a/libavutil/avutil.h b/libavutil/avutil.h
index 782284d046..928a0146a1 100644
--- 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 9b18c97908..2bb27de2b1 100644
--- 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 9e1f2d80ef..cf5cc2fb14 100644
--- 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
-- 
cgit v1.2.3