[FFmpeg-cvslog] r18937 - trunk/libavcodec/mjpegdec.c

[bcoudurier]

Author: bcoudurier
Date: Mon May 25 04:34:31 2009
New Revision: 18937

Log:
honor restart interval in mjpeg, fix #861, SpectralFan.mov still decodes correctly

Modified:
   trunk/libavcodec/mjpegdec.c

Modified: trunk/libavcodec/mjpegdec.c
==============================================================================
--- trunk/libavcodec/mjpegdec.c	Mon May 25 03:53:43 2009	(r18936)
+++ trunk/libavcodec/mjpegdec.c	Mon May 25 04:34:31 2009	(r18937)
@@ -827,9 +827,8 @@ static int mjpeg_decode_scan(MJpegDecode
                     }
                 }
             }
-            /* (< 1350) buggy workaround for Spectralfan.mov, should be fixed */
-            if (s->restart_interval && (s->restart_interval < 1350) &&
-                !--s->restart_count) {
+
+            if (s->restart_interval && !--s->restart_count) {
                 align_get_bits(&s->gb);
                 skip_bits(&s->gb, 16); /* skip RSTn */
                 for (i=0; i<nb_components; i++) /* reset dc */