diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-10-13 18:16:34 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-10-13 18:47:18 +0200 |
| commit | 183117fed7d0a910b5f65e5c78b065f125abf369 (patch) | |
| tree | d9673d0b2b0a772817ae5e5010e278297972abb0 | |
| parent | 083c7bf70131a70bc9a23b4daccd9e688a6c0854 (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>
| -rw-r--r-- | libavutil/avutil.h | 37 | ||||
| -rw-r--r-- | libavutil/version.h | 38 |
2 files changed, 37 insertions, 38 deletions
diff --git a/libavutil/avutil.h b/libavutil/avutil.h index cd02b35d8c..ae6eef1245 100644 --- a/libavutil/avutil.h +++ b/libavutil/avutil.h @@ -109,43 +109,6 @@ /** - * @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) - -/** - * @} - */ - -/** * @addtogroup lavu_ver * @{ */ 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 |