[06/13] h264: Clear the mb members via memset instead of using dsputil

Message ID 1364999209-91097-1-git-send-email-martin@martin.st
State Committed
Commit e8cafd2773bc56455c8816593cbd9368f2d69a80
Headers show

Commit Message

Martin Storsjö April 3, 2013, 2:26 p.m.
---
 libavcodec/h264.c |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

Comments

Luca Barbato April 3, 2013, 3:25 p.m. | #1
On 03/04/13 16:26, Martin Storsjö wrote:
> ---
>  libavcodec/h264.c |    5 +++--
>  1 file changed, 3 insertions(+), 2 deletions(-)

I guess it should be ok.

lu

Patch

diff --git a/libavcodec/h264.c b/libavcodec/h264.c
index 6721365..bfe9940 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;
     }