diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-08-06 14:30:49 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-08-06 14:30:49 +0200 |
| commit | 9547e3eef36921f9937d7154048fd5eafe8d45fb (patch) | |
| tree | c827949a60acb27dcdc601f0e9d8fd6a449c6935 /libavcodec/version.h | |
| parent | c3b29023207850fa3b5b6b4dcb8e4940b86abb83 (diff) | |
| parent | f824535a4a79c260b59d3178b8d958217caffd78 (diff) | |
| download | ffmpeg-9547e3eef36921f9937d7154048fd5eafe8d45fb.tar.gz | |
Merge commit 'f824535a4a79c260b59d3178b8d958217caffd78'
* commit 'f824535a4a79c260b59d3178b8d958217caffd78':
vdpau: deprecate bitstream buffers within the hardware context
Conflicts:
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/version.h')
| -rw-r--r-- | libavcodec/version.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/libavcodec/version.h b/libavcodec/version.h index c0b9ff3faf..4b9a4b26ab 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -29,7 +29,7 @@ #include "libavutil/avutil.h" #define LIBAVCODEC_VERSION_MAJOR 55 -#define LIBAVCODEC_VERSION_MINOR 21 +#define LIBAVCODEC_VERSION_MINOR 22 #define LIBAVCODEC_VERSION_MICRO 100 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ @@ -94,5 +94,8 @@ #ifndef FF_API_CAP_VDPAU #define FF_API_CAP_VDPAU (LIBAVCODEC_VERSION_MAJOR < 56) #endif +#ifndef FF_API_BUFS_VDPAU +#define FF_API_BUFS_VDPAU (LIBAVCODEC_VERSION_MAJOR < 56) +#endif #endif /* AVCODEC_VERSION_H */ |