diff options
| author | Baptiste Coudurier <baptiste.coudurier@gmail.com> | 2009-05-25 02:34:31 +0000 |
|---|---|---|
| committer | Baptiste Coudurier <baptiste.coudurier@gmail.com> | 2009-05-25 02:34:31 +0000 |
| commit | 47b5b0e8b62f6a3e83aff944c35a0fa8f894215b (patch) | |
| tree | d07edf032de4033a7e7697b7a749292b04a38443 /libavcodec | |
| parent | cbd7836e88220a3c4722858635394ff65aac28d8 (diff) | |
| download | ffmpeg-47b5b0e8b62f6a3e83aff944c35a0fa8f894215b.tar.gz | |
honor restart interval in mjpeg, fix #861, SpectralFan.mov still decodes correctly
Originally committed as revision 18937 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/mjpegdec.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c index 9fe8b6f040..d468133a18 100644 --- 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 */ |