Browse Source
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: 183117fed7
Merged-by: Michael Niedermayer <michaelni@gmx.at>
tags/n2.2-rc1
Michael Niedermayer
11 years ago
8 changed files with 8 additions and 8 deletions
Unified View
Diff Options
-
+1 -1libavcodec/version.h
-
+1 -1libavdevice/version.h
-
+1 -1libavfilter/version.h
-
+1 -1libavformat/version.h
-
+1 -1libavresample/version.h
-
+1 -1libavutil/utils.c
-
+1 -1libavutil/version.h
-
+1 -1libswscale/version.h
+ 1
- 1
libavcodec/version.h
View File
| @@ -26,7 +26,7 @@ | |||||
| * Libavcodec version macros. | * Libavcodec version macros. | ||||
| */ | */ | ||||
| #include "libavutil/avutil.h" | |||||
| #include "libavutil/version.h" | |||||
| #define LIBAVCODEC_VERSION_MAJOR 55 | #define LIBAVCODEC_VERSION_MAJOR 55 | ||||
| #define LIBAVCODEC_VERSION_MINOR 46 | #define LIBAVCODEC_VERSION_MINOR 46 | ||||
+ 1
- 1
libavdevice/version.h
View File
| @@ -25,7 +25,7 @@ | |||||
| * Libavdevice version macros | * Libavdevice version macros | ||||
| */ | */ | ||||
| #include "libavutil/avutil.h" | |||||
| #include "libavutil/version.h" | |||||
| #define LIBAVDEVICE_VERSION_MAJOR 55 | #define LIBAVDEVICE_VERSION_MAJOR 55 | ||||
| #define LIBAVDEVICE_VERSION_MINOR 5 | #define LIBAVDEVICE_VERSION_MINOR 5 | ||||
+ 1
- 1
libavfilter/version.h
View File
| @@ -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 | ||||
+ 1
- 1
libavformat/version.h
View File
| @@ -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 22 | #define LIBAVFORMAT_VERSION_MINOR 22 | ||||
+ 1
- 1
libavresample/version.h
View File
| @@ -25,7 +25,7 @@ | |||||
| * Libavresample version macros. | * Libavresample version macros. | ||||
| */ | */ | ||||
| #include "libavutil/avutil.h" | |||||
| #include "libavutil/version.h" | |||||
| #define LIBAVRESAMPLE_VERSION_MAJOR 1 | #define LIBAVRESAMPLE_VERSION_MAJOR 1 | ||||
| #define LIBAVRESAMPLE_VERSION_MINOR 1 | #define LIBAVRESAMPLE_VERSION_MINOR 1 | ||||
+ 1
- 1
libavutil/utils.c
View File
| @@ -17,7 +17,7 @@ | |||||
| */ | */ | ||||
| #include "config.h" | #include "config.h" | ||||
| #include "avutil.h" | |||||
| #include "version.h" | |||||
| #include "avassert.h" | #include "avassert.h" | ||||
| #include "samplefmt.h" | #include "samplefmt.h" | ||||
| #include "pixdesc.h" | #include "pixdesc.h" | ||||
+ 1
- 1
libavutil/version.h
View File
| @@ -41,6 +41,7 @@ | |||||
| * @} | * @} | ||||
| */ | */ | ||||
| /** | /** | ||||
| * @defgroup version_utils Library Version Macros | * @defgroup version_utils Library Version Macros | ||||
| * | * | ||||
| @@ -58,7 +59,6 @@ | |||||
| * @} | * @} | ||||
| */ | */ | ||||
| /** | /** | ||||
| * @file | * @file | ||||
| * @ingroup lavu | * @ingroup lavu | ||||
+ 1
- 1
libswscale/version.h
View File
| @@ -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 5 | #define LIBSWSCALE_VERSION_MINOR 5 | ||||