[FFmpeg-cvslog] mjpeg_decode_scan: reset restart state

Michael Niedermayer git at videolan.org
Tue Jul 9 23:58:19 CEST 2013


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Jul  9 23:43:36 2013 +0200| [776155ca29e7dfc2578ce5f3a7881e52e1ba2d54] | committer: Michael Niedermayer

mjpeg_decode_scan: reset restart state

Fixes Ticket2082
Fixes progressive/refinement + restart jpegs

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

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

 libavcodec/mjpegdec.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c
index 7321b7f..ab4a633 100644
--- a/libavcodec/mjpegdec.c
+++ b/libavcodec/mjpegdec.c
@@ -1029,7 +1029,7 @@ static int mjpeg_decode_scan(MJpegDecodeContext *s, int nb_components, int Ah,
         av_log(s->avctx, AV_LOG_ERROR, "Can not flip image with lowres\n");
         s->flipped = 0;
     }
-
+    s->restart_count = 0;
     for (i = 0; i < nb_components; i++) {
         int c   = s->comp_index[i];
         data[c] = s->picture_ptr->data[c];



More information about the ffmpeg-cvslog mailing list