[Ffmpeg-cvslog] r8735 - trunk/libavcodec/mjpeg.c

michael subversion
Sun Apr 15 00:05:13 CEST 2007


Author: michael
Date: Sun Apr 15 00:05:12 2007
New Revision: 8735

Modified:
   trunk/libavcodec/mjpeg.c

Log:
correct another possible buffer overflow where interlaced would
get stuck to 1 but then width/height would change and interlaced
wouldnt be reset ...


Modified: trunk/libavcodec/mjpeg.c
==============================================================================
--- trunk/libavcodec/mjpeg.c	(original)
+++ trunk/libavcodec/mjpeg.c	Sun Apr 15 00:05:12 2007
@@ -1171,6 +1171,7 @@ static int mjpeg_decode_sof(MJpegDecodeC
 
         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);




More information about the ffmpeg-cvslog mailing list