Commit a030279a authored by Luca Barbato's avatar Luca Barbato

ljpeg: use the correct number of components in yuv

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
parent 8aa35009
...@@ -711,10 +711,9 @@ static int ljpeg_decode_rgb_scan(MJpegDecodeContext *s, int predictor, ...@@ -711,10 +711,9 @@ static int ljpeg_decode_rgb_scan(MJpegDecodeContext *s, int predictor,
} }
static int ljpeg_decode_yuv_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; int i, mb_x, mb_y;
const int nb_components = 3;
for (mb_y = 0; mb_y < s->mb_height; mb_y++) { for (mb_y = 0; mb_y < s->mb_height; mb_y++) {
for (mb_x = 0; mb_x < s->mb_width; mb_x++) { for (mb_x = 0; mb_x < s->mb_width; mb_x++) {
...@@ -1098,7 +1097,8 @@ next_field: ...@@ -1098,7 +1097,8 @@ next_field:
return ret; return ret;
} else { } else {
if ((ret = ljpeg_decode_yuv_scan(s, predictor, if ((ret = ljpeg_decode_yuv_scan(s, predictor,
point_transform)) < 0) point_transform,
nb_components)) < 0)
return ret; return ret;
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment