Commit 47b5b0e8 authored by Baptiste Coudurier's avatar Baptiste Coudurier

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

Originally committed as revision 18937 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent cbd7836e
...@@ -827,9 +827,8 @@ static int mjpeg_decode_scan(MJpegDecodeContext *s, int nb_components, int Ah, i ...@@ -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) && if (s->restart_interval && !--s->restart_count) {
!--s->restart_count) {
align_get_bits(&s->gb); align_get_bits(&s->gb);
skip_bits(&s->gb, 16); /* skip RSTn */ skip_bits(&s->gb, 16); /* skip RSTn */
for (i=0; i<nb_components; i++) /* reset dc */ for (i=0; i<nb_components; i++) /* reset dc */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment