diff options
| author | James Almer <jamrial@gmail.com> | 2017-10-21 23:48:29 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2017-10-21 23:48:29 -0300 |
| commit | 17487f11bb68b1d43a5d1048749cef7f627bacdb (patch) | |
| tree | 97c6dc7a2d23ba6d65876b92ae8c7919c5df51f7 /libavcodec/vdpau.c | |
| parent | c68a3ab96ec0497ae2d627ddd30c61737d18173e (diff) | |
| parent | 5c1585c4c3b5281835d784c5daef0069915ccd57 (diff) | |
| download | ffmpeg-17487f11bb68b1d43a5d1048749cef7f627bacdb.tar.gz | |
Merge commit '5c1585c4c3b5281835d784c5daef0069915ccd57'
* commit '5c1585c4c3b5281835d784c5daef0069915ccd57':
lavc: Drop deprecated VDPAU buffer fields
Merged-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavcodec/vdpau.c')
| -rw-r--r-- | libavcodec/vdpau.c | 25 |
1 files changed, 0 insertions, 25 deletions
diff --git a/libavcodec/vdpau.c b/libavcodec/vdpau.c index 4cc51cb79e..7053dd162a 100644 --- a/libavcodec/vdpau.c +++ b/libavcodec/vdpau.c @@ -33,9 +33,6 @@ // XXX: at the time of adding this ifdefery, av_assert* wasn't use outside. // When dropping it, make sure other av_assert* were not added since then. -#if FF_API_BUFS_VDPAU -#include "libavutil/avassert.h" -#endif #if FF_API_VDPAU #undef NDEBUG @@ -353,18 +350,6 @@ int ff_vdpau_common_end_frame(AVCodecContext *avctx, AVFrame *frame, if (val < 0) return val; -#if FF_API_BUFS_VDPAU -FF_DISABLE_DEPRECATION_WARNINGS - if (hwctx) { - av_assert0(sizeof(hwctx->info) <= sizeof(pic_ctx->info)); - memcpy(&hwctx->info, &pic_ctx->info, sizeof(hwctx->info)); - hwctx->bitstream_buffers = pic_ctx->bitstream_buffers; - hwctx->bitstream_buffers_used = pic_ctx->bitstream_buffers_used; - hwctx->bitstream_buffers_allocated = pic_ctx->bitstream_buffers_allocated; - } -FF_ENABLE_DEPRECATION_WARNINGS -#endif - if (hwctx && !hwctx->render && hwctx->render2) { status = hwctx->render2(avctx, frame, (void *)&pic_ctx->info, pic_ctx->bitstream_buffers_used, pic_ctx->bitstream_buffers); @@ -375,16 +360,6 @@ FF_ENABLE_DEPRECATION_WARNINGS av_freep(&pic_ctx->bitstream_buffers); -#if FF_API_BUFS_VDPAU -FF_DISABLE_DEPRECATION_WARNINGS - if (hwctx) { - hwctx->bitstream_buffers = NULL; - hwctx->bitstream_buffers_used = 0; - hwctx->bitstream_buffers_allocated = 0; - } -FF_ENABLE_DEPRECATION_WARNINGS -#endif - return vdpau_error(status); } |