jpegdec: actually search for and parse RSTn
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 9 Jun 2011 01:35:50 +0000 (03:35 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 9 Jun 2011 01:35:50 +0000 (03:35 +0200)
Fixes Ticket267

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/mjpegdec.c

index afcc1b7..4e58fef 100644 (file)
@@ -881,9 +881,12 @@ static int mjpeg_decode_scan(MJpegDecodeContext *s, int nb_components, int Ah, i
                 }
             }
 
-            if (s->restart_interval && !--s->restart_count) {
+            if (s->restart_interval && show_bits(&s->gb, 8) == 0xFF){/* skip RSTn */
+                --s->restart_count;
                 align_get_bits(&s->gb);
-                skip_bits(&s->gb, 16); /* skip RSTn */
+                while(show_bits(&s->gb, 8) == 0xFF)
+                    skip_bits(&s->gb, 8);
+                skip_bits(&s->gb, 8);
                 for (i=0; i<nb_components; i++) /* reset dc */
                     s->last_dc[i] = 1024;
             }