Browse Source

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

Fixes Ticket4211

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
tags/n2.6
Michael Niedermayer 11 years ago
parent
commit
c263102298
1 changed files with 2 additions and 3 deletions
  1. +2
    -3
      libavcodec/vdpau.c

+ 2
- 3
libavcodec/vdpau.c View File

@@ -288,9 +288,8 @@ int ff_vdpau_common_end_frame(AVCodecContext *avctx, AVFrame *frame,

#if FF_API_BUFS_VDPAU
FF_DISABLE_DEPRECATION_WARNINGS
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));
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;


Loading…
Cancel
Save