aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/h264.c
diff options
context:
space:
mode:
authorMartin Storsjö <martin@martin.st>2013-04-03 17:23:01 +0300
committerMartin Storsjö <martin@martin.st>2013-04-10 11:01:21 +0300
commite8cafd2773bc56455c8816593cbd9368f2d69a80 (patch)
tree51f6571d95677687fe32761ce20bcbee2689a334 /libavcodec/h264.c
parent6d25c9db11e87ec58652de6588448225137b0c57 (diff)
downloadffmpeg-e8cafd2773bc56455c8816593cbd9368f2d69a80.tar.gz
h264: Clear the mb members via memset instead of using dsputil
Signed-off-by: Martin Storsjö <martin@martin.st>
Diffstat (limited to 'libavcodec/h264.c')
-rw-r--r--libavcodec/h264.c5
1 files 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;
}