[FFmpeg-cvslog] jpegdec: actually search for and parse RSTn
Michael Niedermayer
git at videolan.org
Thu Jun 9 03:42:41 CEST 2011
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Jun 9 03:35:50 2011 +0200| [7b8ed831eb8432d202dad16dedc1758b018bb1fa] | committer: Michael Niedermayer
jpegdec: actually search for and parse RSTn
Fixes Ticket267
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7b8ed831eb8432d202dad16dedc1758b018bb1fa
---
libavcodec/mjpegdec.c | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c
index afcc1b7..4e58fef 100644
--- a/libavcodec/mjpegdec.c
+++ b/libavcodec/mjpegdec.c
@@ -881,9 +881,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;
}
More information about the ffmpeg-cvslog
mailing list