[FFmpeg-cvslog] avcodec/vdpau: fix assertion failure and < vs > error

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Dec 28 01:47:05 2014 +0100| [c263102298ecb1cb8d307d881d2f45e0f6fc16d2] | committer: Michael Niedermayer

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

Fixes Ticket4211

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c263102298ecb1cb8d307d881d2f45e0f6fc16d2
---

 libavcodec/vdpau.c |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/libavcodec/vdpau.c b/libavcodec/vdpau.c
index 6f9afa9..475a56c 100644
--- a/libavcodec/vdpau.c
+++ b/libavcodec/vdpau.c
@@ -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;