ljpeg: use the correct number of components in yuv

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
(cherry picked from commit a030279a67)

Signed-off-by: Reinhard Tartler <siretart@tauware.de>
This commit is contained in:
Luca Barbato
2013-05-14 16:20:14 +02:00
committed by Reinhard Tartler
parent c340319559
commit 510a96a211

View File

@@ -709,10 +709,9 @@ static int ljpeg_decode_rgb_scan(MJpegDecodeContext *s, int predictor,
}
static int ljpeg_decode_yuv_scan(MJpegDecodeContext *s, int predictor,
int point_transform)
int point_transform, int nb_components)
{
int i, mb_x, mb_y;
const int nb_components = 3;
for (mb_y = 0; mb_y < s->mb_height; mb_y++) {
for (mb_x = 0; mb_x < s->mb_width; mb_x++) {
@@ -1094,7 +1093,8 @@ next_field:
return ret;
} else {
if ((ret = ljpeg_decode_yuv_scan(s, predictor,
point_transform)) < 0)
point_transform,
nb_components)) < 0)
return ret;
}
}