From 6c3dba5760a18dff23213d0c4de7f57065a4648c Mon Sep 17 00:00:00 2001
From: Michael Niedermayer <michaelni@gmx.at>
Date: Sat, 14 Apr 2007 22:05:12 +0000
Subject: [PATCH] correct another possible buffer overflow where interlaced
would get stuck to 1 but then width/height would change and interlaced
wouldnt be reset ...
Originally committed as revision 8735 to svn://svn.ffmpeg.org/ffmpeg/trunk
---
libavcodec/mjpeg.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/libavcodec/mjpeg.c b/libavcodec/mjpeg.c
index 7f443954be..a0e71d4d2e 100644
--- a/libavcodec/mjpeg.c
+++ b/libavcodec/mjpeg.c
@@ -1171,6 +1171,7 @@ static int mjpeg_decode_sof(MJpegDecodeContext *s)
s->width = width;
s->height = height;
+ s->interlaced = 0;
/* test interlaced mode */
if (s->first_picture &&
@@ -2258,8 +2259,6 @@ read_header:
skip_bits(&hgb, 32); /* padded field size */
second_field_offs = get_bits_long(&hgb, 32);
av_log(avctx, AV_LOG_DEBUG, "second field offs: 0x%x\n", second_field_offs);
- if (second_field_offs)
- s->interlaced = 1;
dqt_offs = get_bits_long(&hgb, 32);
av_log(avctx, AV_LOG_DEBUG, "dqt offs: 0x%x\n", dqt_offs);