generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

handle DRI/RST markers patch by Leon van Stuivenberg <leonvs at iae dot nl>

Browse Source 
Originally committed as revision 826 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Leon van Stuivenberg
2002-07-27 08:27:02 +00:00
committed by Michael Niedermayer
parent ce83897796
commit d6afa9c671
1 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
libavcodec/mjpeg.c
View File

@@ -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; j<nb_components; j++) /* reset dc */
s->last_dc[j] = 1024;
}
} }
} }
ret = 0; ret = 0;
@@ -1156,12 +1162,15 @@ static int find_marker(UINT8 **pbuf_ptr, UINT8 *buf_end,
state = *header_state; state = *header_state;
buf_ptr = *pbuf_ptr; buf_ptr = *pbuf_ptr;
retry:
if (state) { if (state) {
/* get marker */ /* get marker */
found: found:
if (buf_ptr < buf_end) { if (buf_ptr < buf_end) {
val = *buf_ptr++; val = *buf_ptr++;
state = 0; state = 0;
if ((val >= RST0) && (val <= RST7))
goto retry;
} else { } else {
val = -1; val = -1;
} }