summaryrefslogtreecommitdiff
path: root/libavutil/version.h
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-10-13 18:16:34 +0200
committerMichael Niedermayer <michaelni@gmx.at>2012-10-13 18:47:18 +0200
commit183117fed7d0a910b5f65e5c78b065f125abf369 (patch)
treed9673d0b2b0a772817ae5e5010e278297972abb0 /libavutil/version.h
parent083c7bf70131a70bc9a23b4daccd9e688a6c0854 (diff)
libavutil: loose idiotic circular dependancies between version and avutil.h
This fixes the recently appearing PIX_FMT warnings Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/version.h')
-rw-r--r--libavutil/version.h38
1 files changed, 37 insertions, 1 deletions
diff --git a/libavutil/version.h b/libavutil/version.h
index 4751af3f79..3e9c17fdbc 100644
--- a/libavutil/version.h
+++ b/libavutil/version.h
@@ -21,7 +21,43 @@
#ifndef AVUTIL_VERSION_H
#define AVUTIL_VERSION_H
-#include "avutil.h"
+/**
+ * @defgroup preproc_misc Preprocessor String Macros
+ *
+ * String manipulation macros
+ *
+ * @{
+ */
+
+#define AV_STRINGIFY(s) AV_TOSTRING(s)
+#define AV_TOSTRING(s) #s
+
+#define AV_GLUE(a, b) a ## b
+#define AV_JOIN(a, b) AV_GLUE(a, b)
+
+#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)
+
+/**
+ * @}
+ */
+
/**
* @file