Commit 8c0fa61a authored by Michael Niedermayer's avatar Michael Niedermayer Committed by Reinhard Tartler

jpegdec: actually search for and parse RSTn

Fixes decoding of MJPEG files produced by some UVC Logitec web cameras,
such as "Notebook Pro" and "HD C910".

References:
http://trac.videolan.org/vlc/ticket/4215
http://ffmpeg.org/trac/ffmpeg/ticket/267Signed-off-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
Reviewed-by: 's avatarKostya <kostya.shishkov@gmail.com>
(cherry picked from commit 7b8ed831)
parent b4cfb825
......@@ -879,9 +879,12 @@ 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;
align_get_bits(&s->gb);
skip_bits(&s->gb, 16); /* skip RSTn */
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;
}
......
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