[SCM] libav/experimental: handle DRI/RST markers patch by Leon van Stuivenberg <leonvs at iae dot nl>
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Sun Jun 30 15:32:57 UTC 2013
The following commit has been merged in the experimental branch:
commit d6afa9c67176c7102b4ce71cca9c3bc64c5a781a
Author: Leon van Stuivenberg <leonvs at iae.nl>
Date: Sat Jul 27 08:27:02 2002 +0000
handle DRI/RST markers patch by Leon van Stuivenberg <leonvs at iae dot nl>
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; j<nb_components; j++) /* reset dc */
+ s->last_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;
}
--
Libav/FFmpeg packaging
More information about the pkg-multimedia-commits
mailing list