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

git-svn-id: file:///var/local/repositories/ffmpeg/trunk@18937 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b

diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c
index 9fe8b6f040cdaab48d3d630734b427aef0a14db1..d468133a189fc7b0ab80a89b5401769f068ef48b 100644 (file)
--- a/libavcodec/mjpegdec.c
+++ b/libavcodec/mjpegdec.c
@@ -827,9 +827,8 @@ static int mjpeg_decode_scan(MJpegDecodeContext *s, int nb_components, int Ah, i
                     }
                 }
             }
-            /* (< 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 */