diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-07-03 15:03:08 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-07-03 15:03:08 +0200 |
| commit | c7a092cb2d573535dbc26e93a1664f3db39df47c (patch) | |
| tree | fea41a0057e6918be4db132857f4814e28075c55 /libavcodec | |
| parent | 273f600b037ccf166e5540bc6e8e13d3bf738aa9 (diff) | |
| parent | 4cbd5ed11b0161a6a192174934b241e0cc0599a9 (diff) | |
| download | ffmpeg-c7a092cb2d573535dbc26e93a1664f3db39df47c.tar.gz | |
Merge commit '4cbd5ed11b0161a6a192174934b241e0cc0599a9'
* commit '4cbd5ed11b0161a6a192174934b241e0cc0599a9':
jpeg2000: Fix compute precedence error in lut_gain index
jpeg2000: Initialize code blocks structures in precincts to 0
jpeg2000: Check that we have enough components for MCT
Conflicts:
libavcodec/jpeg2000.c
libavcodec/jpeg2000dec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/jpeg2000dec.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libavcodec/jpeg2000dec.c b/libavcodec/jpeg2000dec.c index c486dc2d33..8b19f8b41e 100644 --- a/libavcodec/jpeg2000dec.c +++ b/libavcodec/jpeg2000dec.c @@ -349,7 +349,9 @@ static int get_cod(Jpeg2000DecoderContext *s, Jpeg2000CodingStyle *c, tmp.mct = bytestream2_get_byteu(&s->g); // multiple component transformation if (tmp.mct && s->ncomponents < 3) { - av_log(s->avctx, AV_LOG_ERROR, "MCT %d with too few components (%d)\n", tmp.mct, s->ncomponents); + av_log(s->avctx, AV_LOG_ERROR, + "MCT %d with too few components (%d)\n", + tmp.mct, s->ncomponents); return AVERROR_INVALIDDATA; } |