aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-07-09 23:43:36 +0200
committerMichael Niedermayer <michaelni@gmx.at>2013-07-09 23:43:36 +0200
commit776155ca29e7dfc2578ce5f3a7881e52e1ba2d54 (patch)
treecc65ea7f3db9a5751cbd198dd575c4a3242325be
parente9be4675b88ac9c9c69f452d89b2d0f4d626cb70 (diff)
downloadffmpeg-776155ca29e7dfc2578ce5f3a7881e52e1ba2d54.tar.gz
mjpeg_decode_scan: reset restart state
Fixes Ticket2082 Fixes progressive/refinement + restart jpegs Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--libavcodec/mjpegdec.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c
index 7321b7f18c..ab4a6336e7 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];