diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-08-06 13:45:21 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-08-06 13:45:21 +0200 |
| commit | 4ee0984341d89c657ebdd835483bbe3ea48e9c19 (patch) | |
| tree | 7df0914957f1708ac23cd0b6cc8f4f8a8b1bbf24 /libavutil/version.h | |
| parent | bf36dc50ea448999c8f8c7a35f6139a7040f6275 (diff) | |
| parent | a0ad5d011318f951ecd4c9ffe1829518c9533909 (diff) | |
Merge commit 'a0ad5d011318f951ecd4c9ffe1829518c9533909'
* commit 'a0ad5d011318f951ecd4c9ffe1829518c9533909':
vdpau: deprecate old codec-specific pixel formats
Conflicts:
libavutil/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/version.h')
| -rw-r--r-- | libavutil/version.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/libavutil/version.h b/libavutil/version.h index dafbeffca0..6eafda680d 100644 --- a/libavutil/version.h +++ b/libavutil/version.h @@ -75,7 +75,7 @@ */ #define LIBAVUTIL_VERSION_MAJOR 52 -#define LIBAVUTIL_VERSION_MINOR 40 +#define LIBAVUTIL_VERSION_MINOR 41 #define LIBAVUTIL_VERSION_MICRO 100 #define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \ @@ -135,6 +135,9 @@ #ifndef FF_API_AVFRAME_LAVC #define FF_API_AVFRAME_LAVC (LIBAVUTIL_VERSION_MAJOR < 53) #endif +#ifndef FF_API_VDPAU +#define FF_API_VDPAU (LIBAVUTIL_VERSION_MAJOR < 53) +#endif /** * @} |