diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-09-17 01:32:08 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-09-17 01:38:58 +0200 |
| commit | b002184fa1665a8a7054c38811085071623349cb (patch) | |
| tree | 70174aaaa2036fe646df731ca5b7a75f9dd48f06 /libavcodec | |
| parent | d93a448be3997ccb407b1666a59a377cc07dded5 (diff) | |
| download | ffmpeg-b002184fa1665a8a7054c38811085071623349cb.tar.gz | |
mjpegdec: make sure we dont interpret things after the bitstream buffer as resync marker
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/mjpegdec.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c index c44a0ee1c8..d91effd70d 100644 --- a/libavcodec/mjpegdec.c +++ b/libavcodec/mjpegdec.c @@ -898,9 +898,9 @@ static int mjpeg_decode_scan(MJpegDecodeContext *s, int nb_components, int Ah, i if (s->restart_interval && show_bits(&s->gb, i) == (1<<i)-1){ /* skip RSTn */ int pos= get_bits_count(&s->gb); align_get_bits(&s->gb); - while(show_bits(&s->gb, 8) == 0xFF) + while(get_bits_count(&s->gb) < s->gb.size_in_bits && show_bits(&s->gb, 8) == 0xFF) skip_bits(&s->gb, 8); - if((get_bits(&s->gb, 8)&0xF8) == 0xD0){ + if(get_bits_count(&s->gb) < s->gb.size_in_bits && (get_bits(&s->gb, 8)&0xF8) == 0xD0){ for (i=0; i<nb_components; i++) /* reset dc */ s->last_dc[i] = 1024; }else{ |