Commit 183117fe authored by Michael Niedermayer's avatar Michael Niedermayer

libavutil: loose idiotic circular dependancies between version and avutil.h

This fixes the recently appearing PIX_FMT warnings
Signed-off-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parent 083c7bf7
...@@ -108,43 +108,6 @@ ...@@ -108,43 +108,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 * @addtogroup lavu_ver
* @{ * @{
......
...@@ -21,7 +21,43 @@ ...@@ -21,7 +21,43 @@
#ifndef AVUTIL_VERSION_H #ifndef AVUTIL_VERSION_H
#define 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 * @file
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment