diff options
| author | Martin Vignali <martin.vignali@gmail.com> | 2016-04-07 11:17:18 +0200 |
|---|---|---|
| committer | Paul B Mahol <onemda@gmail.com> | 2016-04-10 19:24:15 +0200 |
| commit | 2dd7b46132e2801ef34fe1b5c27e0113cdcfa2f9 (patch) | |
| tree | db9482c0ca8a0cc972fe0bb2c7891058d390148b /libavcodec | |
| parent | 7e1e25c2dced3e76bb4d35ad082f2abf6ae41c4c (diff) | |
avcodec/exr: fix channel detection
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/exr.c | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/libavcodec/exr.c b/libavcodec/exr.c index 27631261f1..9dd2ee961a 100644 --- a/libavcodec/exr.c +++ b/libavcodec/exr.c @@ -1382,15 +1382,17 @@ static int decode_header(EXRContext *s) return AVERROR_PATCHWELCOME; } - if (channel_index >= 0) { - if (s->pixel_type != EXR_UNKNOWN && - s->pixel_type != current_pixel_type) { - av_log(s->avctx, AV_LOG_ERROR, - "RGB channels not of the same depth.\n"); - return AVERROR_INVALIDDATA; + if (s->channel_offsets[channel_index] == -1){/* channel have not been previously assign */ + if (channel_index >= 0) { + if (s->pixel_type != EXR_UNKNOWN && + s->pixel_type != current_pixel_type) { + av_log(s->avctx, AV_LOG_ERROR, + "RGB channels not of the same depth.\n"); + return AVERROR_INVALIDDATA; + } + s->pixel_type = current_pixel_type; + s->channel_offsets[channel_index] = s->current_channel_offset; } - s->pixel_type = current_pixel_type; - s->channel_offsets[channel_index] = s->current_channel_offset; } s->channels = av_realloc(s->channels, |