diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-07-03 14:49:28 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-07-03 14:50:51 +0200 |
| commit | ac3ca3d311bb09482049fe5e48ba905f3263a728 (patch) | |
| tree | 6ed8d72a329cfb6eebec70d3d748f8acb2b3720d /libavcodec/jpeg2000.c | |
| parent | 9dfa5ea5dcc8171e4465fd90df56b5c199dbae49 (diff) | |
| parent | ef35d6dbc6c3b7ba6b13ac13fc8e797cc1268c8f (diff) | |
| download | ffmpeg-ac3ca3d311bb09482049fe5e48ba905f3263a728.tar.gz | |
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>
Diffstat (limited to 'libavcodec/jpeg2000.c')
| -rw-r--r-- | libavcodec/jpeg2000.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/jpeg2000.c b/libavcodec/jpeg2000.c index 947a745e00..1ab5eb842c 100644 --- a/libavcodec/jpeg2000.c +++ b/libavcodec/jpeg2000.c @@ -202,7 +202,7 @@ int ff_jpeg2000_init_component(Jpeg2000Component *comp, if (codsty->nreslevels2decode <= 0) { 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, |