mirror of https://git.ffmpeg.org/ffmpeg.git
Merge commit 'ef35d6dbc6c3b7ba6b13ac13fc8e797cc1268c8f'
* commit 'ef35d6dbc6c3b7ba6b13ac13fc8e797cc1268c8f': jpeg2000: Propagate error code from get_cox() jpeg2000: Check that nreslevels2decode has been initialized before use Conflicts: libavcodec/jpeg2000dec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
commit
ac3ca3d311
|
@ -202,7 +202,7 @@ int ff_jpeg2000_init_component(Jpeg2000Component *comp,
|
||||||
|
|
||||||
if (codsty->nreslevels2decode <= 0) {
|
if (codsty->nreslevels2decode <= 0) {
|
||||||
av_log(avctx, AV_LOG_ERROR, "nreslevels2decode %d invalid or uninitialized\n", codsty->nreslevels2decode);
|
av_log(avctx, AV_LOG_ERROR, "nreslevels2decode %d invalid or uninitialized\n", codsty->nreslevels2decode);
|
||||||
return AVERROR(EINVAL);
|
return AVERROR_INVALIDDATA;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (ret = ff_jpeg2000_dwt_init(&comp->dwt, comp->coord,
|
if (ret = ff_jpeg2000_dwt_init(&comp->dwt, comp->coord,
|
||||||
|
|
Loading…
Reference in New Issue