diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2014-12-27 13:37:39 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2014-12-27 14:46:15 +0100 |
commit | 6f764d291121f4980b292cdaa537aa8fb10cb93b (patch) | |
tree | d5b576132ba517872c2bad8e8423a96e3d0bef3b /libavcodec/vdpau.c | |
parent | a6ab9ed50d8a5b749f3e0a670e4fd6ee52d92b94 (diff) | |
parent | 737d35e33408263c04d7730f5487eed0d04938ba (diff) |
Merge commit '737d35e33408263c04d7730f5487eed0d04938ba'
* commit '737d35e33408263c04d7730f5487eed0d04938ba':
vdpau: add support for the H.264 High 4:4:4 Predictive profile
Conflicts:
libavcodec/vdpau_internal.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/vdpau.c')
-rw-r--r-- | libavcodec/vdpau.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libavcodec/vdpau.c b/libavcodec/vdpau.c index 7578e62a86..6f9afa9fcc 100644 --- a/libavcodec/vdpau.c +++ b/libavcodec/vdpau.c @@ -288,7 +288,9 @@ int ff_vdpau_common_end_frame(AVCodecContext *avctx, AVFrame *frame, #if FF_API_BUFS_VDPAU FF_DISABLE_DEPRECATION_WARNINGS - hwctx->info = pic_ctx->info; + av_assert0(sizeof(hwctx->info) >= sizeof(pic_ctx->info)); + memset(&hwctx->info, 0, sizeof(hwctx->info)); + memcpy(&hwctx->info, &pic_ctx->info, sizeof(pic_ctx->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; |