ffmpeg | branch: master | Vittorio Giovara <vittorio.giov...@gmail.com> | Mon Dec 5 14:30:09 2016 -0500| [7b917041184874e7d7cba4450813de7e0bb28a33] | committer: Vittorio Giovara
lavc: Drop deprecated VDPAU codec capability Deprecated in 07/2013. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7b917041184874e7d7cba4450813de7e0bb28a33 --- libavcodec/avcodec.h | 6 ------ libavcodec/vdpau.h | 34 ---------------------------------- libavcodec/version.h | 3 --- 3 files changed, 43 deletions(-) diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 35051313fa..f5711baa35 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -1046,12 +1046,6 @@ 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 acd63ccfaf..2f4fa86ba4 100644 --- a/libavcodec/vdpau.h +++ b/libavcodec/vdpau.h @@ -194,40 +194,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 Libav - * 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 Libav 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 */ diff --git a/libavcodec/version.h b/libavcodec/version.h index e720012088..3d7e47c729 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -47,9 +47,6 @@ * the public API and may change, break or disappear at any time. */ -#ifndef FF_API_CAP_VDPAU -#define FF_API_CAP_VDPAU (LIBAVCODEC_VERSION_MAJOR < 58) -#endif #ifndef FF_API_BUFS_VDPAU #define FF_API_BUFS_VDPAU (LIBAVCODEC_VERSION_MAJOR < 58) #endif _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
