diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-08-06 15:54:05 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-08-06 15:54:05 +0400 |
| commit | 3b805dcaa97ed8ac085d6af07ba450846f8487e3 (patch) | |
| tree | 834878733839fa3895ec63819f1b583fcf4ad9c7 /libavcodec/avcodec.h | |
| parent | 4ee0984341d89c657ebdd835483bbe3ea48e9c19 (diff) | |
| parent | 549294fbbe1c00fee37dc4d3f291b98945e11094 (diff) | |
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/avcodec.h')
| -rw-r--r-- | libavcodec/avcodec.h | 2 |
1 files changed, 2 insertions, 0 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 |