aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2011-09-01 23:43:56 +0200
committerMichael Niedermayer <michaelni@gmx.at>2011-09-02 01:09:39 +0200
commit94c2478d90c1b8c007591b8daba13e65d393d2e8 (patch)
tree6039e39501f7fd0f52f0e0c06260ce8ce5a12d21 /libavcodec
parent746f1f14de0a94060f0d6a5cc8c004e043a1507b (diff)
downloadffmpeg-94c2478d90c1b8c007591b8daba13e65d393d2e8.tar.gz
jpegdec: better rst skiping
Fixes Ticket426 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/mjpegdec.c12
1 files changed, 8 insertions, 4 deletions
diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c
index eac30e6e2d..4baacab733 100644
--- a/libavcodec/mjpegdec.c
+++ b/libavcodec/mjpegdec.c
@@ -893,14 +893,18 @@ 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;
+ 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));
+ }
}
}
}