From: Michael Niedermayer <michaelni@gmx.at>
Date: Sat, 17 Nov 2012 20:07:39 +0000 (+0100)
Subject: mjpegdec: reset h/v_count, fix assertion failure.
X-Git-Tag: android-x86-4.4-r1~7990
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=dab19048a1fb8e722cd2029b63ce1fc9d84ff41e;p=android-x86%2Fexternal-ffmpeg.git

mjpegdec: reset h/v_count, fix assertion failure.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
---

diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c
index ae0e504674..915347d321 100644
--- a/libavcodec/mjpegdec.c
+++ b/libavcodec/mjpegdec.c
@@ -263,6 +263,8 @@ int ff_mjpeg_decode_sof(MJpegDecodeContext *s)
     s->nb_components = nb_components;
     s->h_max         = 1;
     s->v_max         = 1;
+    memset(s->h_count, 0, sizeof(s->h_count));
+    memset(s->v_count, 0, sizeof(s->v_count));
     for (i = 0; i < nb_components; i++) {
         /* component id */
         s->component_id[i] = get_bits(&s->gb, 8) - 1;