diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-08-06 13:54:05 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-08-06 13:54:05 +0200 |
| commit | 3b805dcaa97ed8ac085d6af07ba450846f8487e3 (patch) | |
| tree | 834878733839fa3895ec63819f1b583fcf4ad9c7 /libavcodec | |
| parent | 4ee0984341d89c657ebdd835483bbe3ea48e9c19 (diff) | |
| parent | 549294fbbe1c00fee37dc4d3f291b98945e11094 (diff) | |
| download | ffmpeg-3b805dcaa97ed8ac085d6af07ba450846f8487e3.tar.gz | |
Merge commit '549294fbbe1c00fee37dc4d3f291b98945e11094'
* commit '549294fbbe1c00fee37dc4d3f291b98945e11094':
vdpau: deprecate VDPAU codec capability
Conflicts:
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/avcodec.h | 2 | ||||
| -rw-r--r-- | libavcodec/vdpau.h | 3 | ||||
| -rw-r--r-- | libavcodec/version.h | 5 |
3 files changed, 8 insertions, 2 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index ae6625f5b9..c7582e2788 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -762,10 +762,12 @@ typedef struct RcOverride{ * This can be used to prevent truncation of the last audio samples. */ #define CODEC_CAP_SMALL_LAST_FRAME 0x0040 +#if FF_API_CAP_VDPAU /** * Codec can export data for HW decoding (VDPAU). */ #define CODEC_CAP_HWACCEL_VDPAU 0x0080 +#endif /** * Codec can output multiple frames per AVPacket * Normally demuxers return one frame at a time, demuxers which do not do diff --git a/libavcodec/vdpau.h b/libavcodec/vdpau.h index 37d212cd86..545b154be0 100644 --- a/libavcodec/vdpau.h +++ b/libavcodec/vdpau.h @@ -114,7 +114,7 @@ typedef struct AVVDPAUContext { VdpBitstreamBuffer *bitstream_buffers; } AVVDPAUContext; - +#if FF_API_CAP_VDPAU /** @brief The videoSurface is used for rendering. */ #define FF_VDPAU_STATE_USED_FOR_RENDER 1 @@ -153,6 +153,7 @@ struct vdpau_render_state { union AVVDPAUPictureInfo info; #endif }; +#endif /* @}*/ diff --git a/libavcodec/version.h b/libavcodec/version.h index 38c7029ebf..c0b9ff3faf 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 20 +#define LIBAVCODEC_VERSION_MINOR 21 #define LIBAVCODEC_VERSION_MICRO 100 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ @@ -91,5 +91,8 @@ #ifndef FF_API_LOWRES #define FF_API_LOWRES (LIBAVCODEC_VERSION_MAJOR < 56) #endif +#ifndef FF_API_CAP_VDPAU +#define FF_API_CAP_VDPAU (LIBAVCODEC_VERSION_MAJOR < 56) +#endif #endif /* AVCODEC_VERSION_H */ |