From: Leon van Stuivenberg Date: Sat, 27 Jul 2002 08:27:02 +0000 (+0000) Subject: handle DRI/RST markers patch by Leon van Stuivenberg X-Git-Tag: v0.5~17444 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d6afa9c67176c7102b4ce71cca9c3bc64c5a781a;p=platform%2Fupstream%2Flibav.git handle DRI/RST markers patch by Leon van Stuivenberg Originally committed as revision 826 to svn://svn.ffmpeg.org/ffmpeg/trunk --- diff --git a/libavcodec/mjpeg.c b/libavcodec/mjpeg.c index 5beb47e..c4ebee6 100644 --- a/libavcodec/mjpeg.c +++ b/libavcodec/mjpeg.c @@ -1004,6 +1004,12 @@ static int mjpeg_decode_sos(MJpegDecodeContext *s, } } } + if (s->restart_interval && !--s->restart_count) { + align_get_bits(&s->gb); + skip_bits(&s->gb, 16); /* skip RSTn */ + for (j=0; jlast_dc[j] = 1024; + } } } ret = 0; @@ -1156,12 +1162,15 @@ static int find_marker(UINT8 **pbuf_ptr, UINT8 *buf_end, state = *header_state; buf_ptr = *pbuf_ptr; +retry: if (state) { /* get marker */ found: if (buf_ptr < buf_end) { val = *buf_ptr++; state = 0; + if ((val >= RST0) && (val <= RST7)) + goto retry; } else { val = -1; }