diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-21 11:25:46 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-21 11:25:46 +0200 |
| commit | 3b071a4390f02ecbeb993f16f93b01f4e420def8 (patch) | |
| tree | ef15b1e9d24f3ad9700c0a17ea770a45007a0230 /libavcodec | |
| parent | f57a7ac9b8e0e55e3722ea82c084ff7d7dc2b2fd (diff) | |
| parent | a030279a67ef883df8cf3707774656fa1be81078 (diff) | |
| download | ffmpeg-3b071a4390f02ecbeb993f16f93b01f4e420def8.tar.gz | |
Merge commit 'a030279a67ef883df8cf3707774656fa1be81078'
* commit 'a030279a67ef883df8cf3707774656fa1be81078':
ljpeg: use the correct number of components in yuv
Conflicts:
libavcodec/mjpegdec.c
See: b2e57eb5a3cb9d5dfab601077fa0edee91e06ca5
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/mjpegdec.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c index 214b22182d..9322ffeeb5 100644 --- a/libavcodec/mjpegdec.c +++ b/libavcodec/mjpegdec.c @@ -853,8 +853,8 @@ static int ljpeg_decode_rgb_scan(MJpegDecodeContext *s, int nb_components, int p return 0; } -static int ljpeg_decode_yuv_scan(MJpegDecodeContext *s, int nb_components, int predictor, - int point_transform) +static int ljpeg_decode_yuv_scan(MJpegDecodeContext *s, int predictor, + int point_transform, int nb_components) { int i, mb_x, mb_y; 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) return ret; } 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; } } |