aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-01-14 23:44:50 +0100
committerMichael Niedermayer <michaelni@gmx.at>2012-01-15 00:53:59 +0100
commita91f2066651416e0f9315e7fb0132587352c75dc (patch)
treefe720ac17a23fee0ac57b5e70d88219614ad955c /libavcodec
parent1843e6c8aa9752aa7d500f8a2a0f072cf3a3aee0 (diff)
downloadffmpeg-a91f2066651416e0f9315e7fb0132587352c75dc.tar.gz
ljpegdec: reset restart interval for each plane of a non interleaved file.
Fixes Ticket907 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/mjpegdec.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c
index d3bcb6fd27..ad78b4cc0d 100644
--- a/libavcodec/mjpegdec.c
+++ b/libavcodec/mjpegdec.c
@@ -706,6 +706,8 @@ static int ljpeg_decode_rgb_scan(MJpegDecodeContext *s, int nb_components, int p
int resync_mb_y = 0;
int resync_mb_x = 0;
+ s->restart_count = s->restart_interval;
+
av_fast_malloc(&s->ljpeg_buffer, &s->ljpeg_buffer_size,
(unsigned)s->mb_width * 4 * sizeof(s->ljpeg_buffer[0][0]));
buffer = s->ljpeg_buffer;