This is a more sensible place for these macros.tags/n2.2-rc1
@@ -26,6 +26,8 @@ | |||||
* Libavcodec version macros. | * Libavcodec version macros. | ||||
*/ | */ | ||||
#include "libavutil/version.h" | |||||
#define LIBAVCODEC_VERSION_MAJOR 55 | #define LIBAVCODEC_VERSION_MAJOR 55 | ||||
#define LIBAVCODEC_VERSION_MINOR 31 | #define LIBAVCODEC_VERSION_MINOR 31 | ||||
#define LIBAVCODEC_VERSION_MICRO 0 | #define LIBAVCODEC_VERSION_MICRO 0 | ||||
@@ -25,7 +25,7 @@ | |||||
* Libavdevice version macros | * Libavdevice version macros | ||||
*/ | */ | ||||
#include "libavutil/avutil.h" | |||||
#include "libavutil/version.h" | |||||
#define LIBAVDEVICE_VERSION_MAJOR 54 | #define LIBAVDEVICE_VERSION_MAJOR 54 | ||||
#define LIBAVDEVICE_VERSION_MINOR 0 | #define LIBAVDEVICE_VERSION_MINOR 0 | ||||
@@ -27,7 +27,7 @@ | |||||
* Libavfilter version macros | * Libavfilter version macros | ||||
*/ | */ | ||||
#include "libavutil/avutil.h" | |||||
#include "libavutil/version.h" | |||||
#define LIBAVFILTER_VERSION_MAJOR 4 | #define LIBAVFILTER_VERSION_MAJOR 4 | ||||
#define LIBAVFILTER_VERSION_MINOR 0 | #define LIBAVFILTER_VERSION_MINOR 0 | ||||
@@ -27,7 +27,7 @@ | |||||
* Libavformat version macros | * Libavformat version macros | ||||
*/ | */ | ||||
#include "libavutil/avutil.h" | |||||
#include "libavutil/version.h" | |||||
#define LIBAVFORMAT_VERSION_MAJOR 55 | #define LIBAVFORMAT_VERSION_MAJOR 55 | ||||
#define LIBAVFORMAT_VERSION_MINOR 10 | #define LIBAVFORMAT_VERSION_MINOR 10 | ||||
@@ -25,6 +25,8 @@ | |||||
* Libavresample version macros. | * Libavresample version macros. | ||||
*/ | */ | ||||
#include "libavutil/version.h" | |||||
#define LIBAVRESAMPLE_VERSION_MAJOR 1 | #define LIBAVRESAMPLE_VERSION_MAJOR 1 | ||||
#define LIBAVRESAMPLE_VERSION_MINOR 1 | #define LIBAVRESAMPLE_VERSION_MINOR 1 | ||||
#define LIBAVRESAMPLE_VERSION_MICRO 0 | #define LIBAVRESAMPLE_VERSION_MICRO 0 | ||||
@@ -163,23 +163,6 @@ | |||||
#define AV_PRAGMA(s) _Pragma(#s) | #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) | |||||
/** | /** | ||||
* @} | * @} | ||||
*/ | */ | ||||
@@ -17,7 +17,7 @@ | |||||
*/ | */ | ||||
#include "config.h" | #include "config.h" | ||||
#include "avutil.h" | |||||
#include "version.h" | |||||
/** | /** | ||||
* @file | * @file | ||||
@@ -21,6 +21,23 @@ | |||||
#include "avutil.h" | #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 | * @file | ||||
* @ingroup lavu | * @ingroup lavu | ||||
@@ -24,7 +24,7 @@ | |||||
* swscale version macros | * swscale version macros | ||||
*/ | */ | ||||
#include "libavutil/avutil.h" | |||||
#include "libavutil/version.h" | |||||
#define LIBSWSCALE_VERSION_MAJOR 2 | #define LIBSWSCALE_VERSION_MAJOR 2 | ||||
#define LIBSWSCALE_VERSION_MINOR 1 | #define LIBSWSCALE_VERSION_MINOR 1 | ||||