[FFmpeg-cvslog] mjpegdec; even better RSTn skiping

[Michael Niedermayer]

ffmpeg | branch: release/0.7 | Michael Niedermayer <michaelni at gmx.at> | Tue Sep  6 18:20:34 2011 +0200| [eb975b1c8bfc0d881479a5ba5c4ace4122191687] | committer: Carl Eugen Hoyos

mjpegdec; even better RSTn skiping
Fixes Ticket426

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit be7eed72c89368de70dbf8749eca1dac7443e51a)

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=eb975b1c8bfc0d881479a5ba5c4ace4122191687
---

 libavcodec/mjpegdec.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c
index cb5bc23..e64ea5c 100644
--- a/libavcodec/mjpegdec.c
+++ b/libavcodec/mjpegdec.c
@@ -882,7 +882,8 @@ 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 */
+            i= 8+((-get_bits_count(&s->gb))&7);
+            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)