diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-12-27 12:01:23 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-12-27 12:01:23 +0100 |
| commit | 25b243759cb63621c96f20fe9426a3d067be70bf (patch) | |
| tree | 1e535335b05392a328b508b3da3aae7e44a84f8e | |
| parent | e630ca5111077fa8adc972fe8a3d7e2b3e8dc91f (diff) | |
| parent | b83d1ee3b41cfe8357836e2582104db2f3364cb0 (diff) | |
| download | ffmpeg-25b243759cb63621c96f20fe9426a3d067be70bf.tar.gz | |
Merge commit 'b83d1ee3b41cfe8357836e2582104db2f3364cb0'
* commit 'b83d1ee3b41cfe8357836e2582104db2f3364cb0':
avutil: Move library version related macros to version.h
Conflicts:
libavcodec/version.h
libavresample/version.h
libavutil/avutil.h
libavutil/utils.c
See: 183117fed7d0a910b5f65e5c78b065f125abf369
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/version.h | 2 | ||||
| -rw-r--r-- | libavdevice/version.h | 2 | ||||
| -rw-r--r-- | libavfilter/version.h | 2 | ||||
| -rw-r--r-- | libavformat/version.h | 2 | ||||
| -rw-r--r-- | libavresample/version.h | 2 | ||||
| -rw-r--r-- | libavutil/utils.c | 2 | ||||
| -rw-r--r-- | libavutil/version.h | 2 | ||||
| -rw-r--r-- | libswscale/version.h | 2 |
8 files changed, 8 insertions, 8 deletions
diff --git a/libavcodec/version.h b/libavcodec/version.h index 0d75976bd6..06af735728 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -26,7 +26,7 @@ * Libavcodec version macros. */ -#include "libavutil/avutil.h" +#include "libavutil/version.h" #define LIBAVCODEC_VERSION_MAJOR 55 #define LIBAVCODEC_VERSION_MINOR 46 diff --git a/libavdevice/version.h b/libavdevice/version.h index 0bbd48e7a5..d569faefc5 100644 --- a/libavdevice/version.h +++ b/libavdevice/version.h @@ -25,7 +25,7 @@ * Libavdevice version macros */ -#include "libavutil/avutil.h" +#include "libavutil/version.h" #define LIBAVDEVICE_VERSION_MAJOR 55 #define LIBAVDEVICE_VERSION_MINOR 5 diff --git a/libavfilter/version.h b/libavfilter/version.h index f6eb82e4e7..ff5b604ab8 100644 --- a/libavfilter/version.h +++ b/libavfilter/version.h @@ -27,7 +27,7 @@ * Libavfilter version macros */ -#include "libavutil/avutil.h" +#include "libavutil/version.h" #define LIBAVFILTER_VERSION_MAJOR 4 #define LIBAVFILTER_VERSION_MINOR 0 diff --git a/libavformat/version.h b/libavformat/version.h index 4fe8364ab2..ee8679d5fe 100644 --- a/libavformat/version.h +++ b/libavformat/version.h @@ -27,7 +27,7 @@ * Libavformat version macros */ -#include "libavutil/avutil.h" +#include "libavutil/version.h" #define LIBAVFORMAT_VERSION_MAJOR 55 #define LIBAVFORMAT_VERSION_MINOR 22 diff --git a/libavresample/version.h b/libavresample/version.h index 0dd5bb62c5..4495c2f3c7 100644 --- a/libavresample/version.h +++ b/libavresample/version.h @@ -25,7 +25,7 @@ * Libavresample version macros. */ -#include "libavutil/avutil.h" +#include "libavutil/version.h" #define LIBAVRESAMPLE_VERSION_MAJOR 1 #define LIBAVRESAMPLE_VERSION_MINOR 1 diff --git a/libavutil/utils.c b/libavutil/utils.c index 4c82503d9c..9453c30ce6 100644 --- a/libavutil/utils.c +++ b/libavutil/utils.c @@ -17,7 +17,7 @@ */ #include "config.h" -#include "avutil.h" +#include "version.h" #include "avassert.h" #include "samplefmt.h" #include "pixdesc.h" diff --git a/libavutil/version.h b/libavutil/version.h index a70a110662..446e1f208a 100644 --- a/libavutil/version.h +++ b/libavutil/version.h @@ -41,6 +41,7 @@ * @} */ + /** * @defgroup version_utils Library Version Macros * @@ -58,7 +59,6 @@ * @} */ - /** * @file * @ingroup lavu diff --git a/libswscale/version.h b/libswscale/version.h index 360ec820a9..99f329539b 100644 --- a/libswscale/version.h +++ b/libswscale/version.h @@ -24,7 +24,7 @@ * swscale version macros */ -#include "libavutil/avutil.h" +#include "libavutil/version.h" #define LIBSWSCALE_VERSION_MAJOR 2 #define LIBSWSCALE_VERSION_MINOR 5 |