diff options
| author | Rémi Denis-Courmont <remi@remlab.net> | 2013-07-25 22:30:19 +0300 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2013-08-05 11:20:32 +0200 |
| commit | 549294fbbe1c00fee37dc4d3f291b98945e11094 (patch) | |
| tree | 6ae926d67f115bd077eb0a4d9a2c35a8b41bc6ae /libavcodec | |
| parent | a0ad5d011318f951ecd4c9ffe1829518c9533909 (diff) | |
vdpau: deprecate VDPAU codec capability
Signed-off-by: Anton Khirnov <anton@khirnov.net>
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 a84c0130a9..7b26de1c53 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -700,10 +700,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 a58931503b..18efcaa6e5 100644 --- a/libavcodec/vdpau.h +++ b/libavcodec/vdpau.h @@ -113,7 +113,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 @@ -145,6 +145,7 @@ struct vdpau_render_state { /** The user is responsible for freeing this buffer using av_freep(). */ VdpBitstreamBuffer *bitstream_buffers; }; +#endif /* @}*/ diff --git a/libavcodec/version.h b/libavcodec/version.h index 575fa2647e..41a9d7a05a 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -27,7 +27,7 @@ */ #define LIBAVCODEC_VERSION_MAJOR 55 -#define LIBAVCODEC_VERSION_MINOR 11 +#define LIBAVCODEC_VERSION_MINOR 12 #define LIBAVCODEC_VERSION_MICRO 0 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ @@ -64,5 +64,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 */ |