generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge commit 'a030279a67ef883df8cf3707774656fa1be81078'

Browse Source 
* commit 'a030279a67ef883df8cf3707774656fa1be81078':
  ljpeg: use the correct number of components in yuv

Conflicts:
	libavcodec/mjpegdec.c

See: b2e57eb5a3cb9d5dfab601077fa0edee91e06ca5

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-05-21 11:25:46 +02:00
commit 3b071a4390
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libavcodec/mjpegdec.c
View File

@ -853,8 +853,8 @@ static int ljpeg_decode_rgb_scan(MJpegDecodeContext *s, int nb_components, int p
return 0; return 0;
} }
static int ljpeg_decode_yuv_scan(MJpegDecodeContext *s, int nb_components, 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;
int bits= (s->bits+7)&~7; int bits= (s->bits+7)&~7;
@ -1297,7 +1297,9 @@ next_field:
if ((ret = ljpeg_decode_rgb_scan(s, nb_components, predictor, point_transform)) < 0) if ((ret = ljpeg_decode_rgb_scan(s, nb_components, predictor, point_transform)) < 0)
return ret; return ret;
} else { } else {
if ((ret = ljpeg_decode_yuv_scan(s, nb_components, predictor, point_transform)) < 0) if ((ret = ljpeg_decode_yuv_scan(s, predictor,
point_transform,
nb_components)) < 0)
return ret; return ret;
} }
} }