From e8cafd2773bc56455c8816593cbd9368f2d69a80 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Storsj=C3=B6?= Date: Wed, 3 Apr 2013 17:23:01 +0300 Subject: [PATCH] h264: Clear the mb members via memset instead of using dsputil MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Martin Storsjö --- libavcodec/h264.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/libavcodec/h264.c b/libavcodec/h264.c index 6721365eb9..bfe9940738 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -1612,6 +1612,9 @@ static int decode_update_thread_context(AVCodecContext *dst, memset(h->pps_buffers, 0, sizeof(h->pps_buffers)); memset(&h->er, 0, sizeof(h->er)); memset(&h->me, 0, sizeof(h->me)); + memset(&h->mb, 0, sizeof(h->mb)); + memset(&h->mb_luma_dc, 0, sizeof(h->mb_luma_dc)); + memset(&h->mb_padding, 0, sizeof(h->mb_padding)); h->context_initialized = 0; memset(&h->cur_pic, 0, sizeof(h->cur_pic)); @@ -1640,8 +1643,6 @@ static int decode_update_thread_context(AVCodecContext *dst, h->thread_context[0] = h; - h->dsp.clear_blocks(h->mb); - h->dsp.clear_blocks(h->mb + (24 * 16 << h->pixel_shift)); h->context_initialized = 1; }