From: Michael Niedermayer <[email protected]> This fixes the recently appearing PIX_FMT warnings.
Signed-off-by: Michael Niedermayer <[email protected]> Signed-off-by: Derek Buitenhuis <[email protected]> --- The other option is to move it to its own header, which version.h and avutil.h can include. --- libavutil/avutil.h | 37 ------------------------------------- libavutil/version.h | 38 +++++++++++++++++++++++++++++++++++++- 2 files changed, 37 insertions(+), 38 deletions(-) diff --git a/libavutil/avutil.h b/libavutil/avutil.h index 6bb5510..9eced9f 100644 --- a/libavutil/avutil.h +++ b/libavutil/avutil.h @@ -148,43 +148,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 dad8e2f..95f23eb 100644 --- a/libavutil/version.h +++ b/libavutil/version.h @@ -19,7 +19,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 -- 1.8.5.1 _______________________________________________ libav-devel mailing list [email protected] https://lists.libav.org/mailman/listinfo/libav-devel
