[FFmpeg-cvslog] jpegdec: better rst skiping
Michael Niedermayer
git at videolan.org
Wed Sep 7 01:11:34 CEST 2011
ffmpeg | branch: release/0.7 | Michael Niedermayer <michaelni at gmx.at> | Thu Sep 1 23:43:56 2011 +0200| [a352fedb2415368a032a348dcd038624637197fa] | committer: Carl Eugen Hoyos
jpegdec: better rst skiping
Fixes Ticket426
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a352fedb2415368a032a348dcd038624637197fa
---
libavcodec/mjpegdec.c | 14 +++++++++-----
1 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c
index 02c66f5..cb5bc23 100644
--- a/libavcodec/mjpegdec.c
+++ b/libavcodec/mjpegdec.c
@@ -881,14 +881,18 @@ static int mjpeg_decode_scan(MJpegDecodeContext *s, int nb_components, int Ah, i
}
}
- if (s->restart_interval && show_bits(&s->gb, 8) == 0xFF){/* skip RSTn */
- --s->restart_count;
+ if (s->restart_interval) --s->restart_count;
+ if (s->restart_interval && show_bits(&s->gb, 8) == 0xFF){ /* skip RSTn */
+ int pos= get_bits_count(&s->gb);
align_get_bits(&s->gb);
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;
+ if((get_bits(&s->gb, 8)&0xF8) == 0xD0){
+ for (i=0; i<nb_components; i++) /* reset dc */
+ s->last_dc[i] = 1024;
+ }else{
+ skip_bits_long(&s->gb, pos - get_bits_count(&s->gb));
+ }
}
}
}
More information about the ffmpeg-cvslog
mailing list