diff options
| author | Diego Biurrun <diego@biurrun.de> | 2013-12-25 17:16:05 +0100 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2013-12-26 19:05:22 +0100 |
| commit | b83d1ee3b41cfe8357836e2582104db2f3364cb0 (patch) | |
| tree | 793ba32902f6c0a807e99ecdd5c01e0b6064d531 /libavutil | |
| parent | 1716b4c7b888a00380b36d3a49f725e6a243ed18 (diff) | |
| download | ffmpeg-b83d1ee3b41cfe8357836e2582104db2f3364cb0.tar.gz | |
avutil: Move library version related macros to version.h
This is a more sensible place for these macros.
Diffstat (limited to 'libavutil')
| -rw-r--r-- | libavutil/avutil.h | 17 | ||||
| -rw-r--r-- | libavutil/utils.c | 2 | ||||
| -rw-r--r-- | libavutil/version.h | 17 |
3 files changed, 18 insertions, 18 deletions
diff --git a/libavutil/avutil.h b/libavutil/avutil.h index 782284d046..928a0146a1 100644 --- a/libavutil/avutil.h +++ b/libavutil/avutil.h @@ -168,23 +168,6 @@ */ /** - * @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/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 @@ -22,6 +22,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 * Libavutil version macros |