jpegdec: better rst skiping
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 1 Sep 2011 21:43:56 +0000 (23:43 +0200)
committerCarl Eugen Hoyos <cehoyos@ag.or.at>
Tue, 6 Sep 2011 22:31:14 +0000 (00:31 +0200)
Fixes Ticket426

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 94c2478d90c1b8c007591b8daba13e65d393d2e8)

libavcodec/mjpegdec.c

index 5c6d84a..cb5bc23 100644 (file)
@@ -881,14 +881,18 @@ 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;
+                int pos= get_bits_count(&s->gb);
                 align_get_bits(&s->gb);
                 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;
+                if((get_bits(&s->gb, 8)&0xF8) == 0xD0){
+                    for (i=0; i<nb_components; i++) /* reset dc */
+                        s->last_dc[i] = 1024;
+                }else{
+                    skip_bits_long(&s->gb, pos - get_bits_count(&s->gb));
+                }
             }
         }
     }