diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-08-21 22:44:58 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-08-21 22:44:58 +0200 |
| commit | 878a7d1573d2031173a60efba453c558d826a506 (patch) | |
| tree | c57974d271ec05fa6d4d9d933e0950f31027cd5e /libavcodec/mjpegdec.c | |
| parent | 6a57021cf96dc548b6cc2c97dedb8958225d58e3 (diff) | |
| parent | bd968d260aef322fb32e254a3de0d2036c57bd56 (diff) | |
| download | ffmpeg-878a7d1573d2031173a60efba453c558d826a506.tar.gz | |
Merge remote-tracking branch 'qatar/release/0.7' into release/0.8
* qatar/release/0.7:
cavs: fix some crashes with invalid bitstreams
jpegdec: actually search for and parse RSTn
Conflicts:
libavcodec/mjpegdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/mjpegdec.c')
| -rw-r--r-- | libavcodec/mjpegdec.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c index 02c66f504b..5c6d84a07d 100644 --- a/libavcodec/mjpegdec.c +++ b/libavcodec/mjpegdec.c @@ -881,7 +881,7 @@ 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 */ + if (s->restart_interval && show_bits(&s->gb, 8) == 0xFF){ /* skip RSTn */ --s->restart_count; align_get_bits(&s->gb); while(show_bits(&s->gb, 8) == 0xFF) |