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/vdpau.h | |
| parent | 4ee0984341d89c657ebdd835483bbe3ea48e9c19 (diff) | |
| parent | 549294fbbe1c00fee37dc4d3f291b98945e11094 (diff) | |
| download | android_external_ffmpeg-3b805dcaa97ed8ac085d6af07ba450846f8487e3.tar.gz android_external_ffmpeg-3b805dcaa97ed8ac085d6af07ba450846f8487e3.tar.bz2 android_external_ffmpeg-3b805dcaa97ed8ac085d6af07ba450846f8487e3.zip | |
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/vdpau.h')
| -rw-r--r-- | libavcodec/vdpau.h | 3 |
1 files changed, 2 insertions, 1 deletions
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 /* @}*/ |