# HG changeset patch # User michaelni # Date 1027758422 0 # Node ID 03e395b31197ba0a8034bab398bbadec645791e0 # Parent d6955d0d7d272f2fafad88f3ff870b530b63f050 handle DRI/RST markers patch by Leon van Stuivenberg diff -r d6955d0d7d27 -r 03e395b31197 mjpeg.c --- a/mjpeg.c Sat Jul 27 03:08:04 2002 +0000 +++ b/mjpeg.c Sat Jul 27 08:27:02 2002 +0000 @@ -1004,6 +1004,12 @@ } } } + 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 @@ 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; }