diff options
author | James Almer <jamrial@gmail.com> | 2017-10-21 23:40:03 -0300 |
---|---|---|
committer | James Almer <jamrial@gmail.com> | 2017-10-21 23:40:03 -0300 |
commit | c68a3ab96ec0497ae2d627ddd30c61737d18173e (patch) | |
tree | 5176f02ac79027e41655aa4c67a16913675461c6 /libavcodec/vdpau.h | |
parent | b48ed00403603f5d850eaa7b3e2fcda9ef98fb1c (diff) | |
parent | 7b917041184874e7d7cba4450813de7e0bb28a33 (diff) | |
download | ffmpeg-c68a3ab96ec0497ae2d627ddd30c61737d18173e.tar.gz |
Merge commit '7b917041184874e7d7cba4450813de7e0bb28a33'
* commit '7b917041184874e7d7cba4450813de7e0bb28a33':
lavc: Drop deprecated VDPAU codec capability
Merged-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavcodec/vdpau.h')
-rw-r--r-- | libavcodec/vdpau.h | 34 |
1 files changed, 0 insertions, 34 deletions
diff --git a/libavcodec/vdpau.h b/libavcodec/vdpau.h index 855d387d9a..458e4fa605 100644 --- a/libavcodec/vdpau.h +++ b/libavcodec/vdpau.h @@ -214,40 +214,6 @@ attribute_deprecated int av_vdpau_get_profile(AVCodecContext *avctx, VdpDecoderProfile *profile); #endif -#if FF_API_CAP_VDPAU -/** @brief The videoSurface is used for rendering. */ -#define FF_VDPAU_STATE_USED_FOR_RENDER 1 - -/** - * @brief The videoSurface is needed for reference/prediction. - * The codec manipulates this. - */ -#define FF_VDPAU_STATE_USED_FOR_REFERENCE 2 - -/** - * @brief This structure is used as a callback between the FFmpeg - * decoder (vd_) and presentation (vo_) module. - * This is used for defining a video frame containing surface, - * picture parameter, bitstream information etc which are passed - * between the FFmpeg decoder and its clients. - */ -struct vdpau_render_state { - VdpVideoSurface surface; ///< Used as rendered surface, never changed. - - int state; ///< Holds FF_VDPAU_STATE_* values. - - /** picture parameter information for all supported codecs */ - union AVVDPAUPictureInfo info; - - /** Describe size/location of the compressed video data. - Set to 0 when freeing bitstream_buffers. */ - int bitstream_buffers_allocated; - int bitstream_buffers_used; - /** The user is responsible for freeing this buffer using av_freep(). */ - VdpBitstreamBuffer *bitstream_buffers; -}; -#endif - /* @}*/ #endif /* AVCODEC_VDPAU_H */ |