Chiebot-Mirror
/
FFmpeg
mirror of https://github.com/FFmpeg/FFmpeg.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

avcodec/vdpau: fix assertion failure and < vs > error

Browse Source 
Fixes Ticket4211

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
pull/101/head
Michael Niedermayer 10 years ago
parent 17dde95ec5
commit c263102298
1 changed files with 2 additions and 3 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 5
      libavcodec/vdpau.c

5
libavcodec/vdpau.c
Unescape View File

@ -288,9 +288,8 @@ int ff_vdpau_common_end_frame(AVCodecContext *avctx, AVFrame *frame,
#if FF_API_BUFS_VDPAU #if FF_API_BUFS_VDPAU
FF_DISABLE_DEPRECATION_WARNINGS FF_DISABLE_DEPRECATION_WARNINGS
av_assert0(sizeof(hwctx->info) >= sizeof(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(hwctx->info));
memcpy(&hwctx->info, &pic_ctx->info, sizeof(pic_ctx->info));
hwctx->bitstream_buffers = pic_ctx->bitstream_buffers; hwctx->bitstream_buffers = pic_ctx->bitstream_buffers;
hwctx->bitstream_buffers_used = pic_ctx->bitstream_buffers_used; hwctx->bitstream_buffers_used = pic_ctx->bitstream_buffers_used;
hwctx->bitstream_buffers_allocated = pic_ctx->bitstream_buffers_allocated; hwctx->bitstream_buffers_allocated = pic_ctx->bitstream_buffers_allocated;

Write Preview
Loading…
Cancel
Save