avcodec/exr: fix channel detection

2dd7b461 · Martin Vignali · Paul B Mahol · 7e1e25c2 · 2dd7b461
Commit 2dd7b461 authored Apr 07, 2016 by Martin Vignali Committed by Paul B Mahol Apr 10, 2016
Show whitespace changes
Inline Side-by-side

Showing with 10 additions and 8 deletions

exr.c libavcodec/exr.c +10 -8

No files found.
--- a/libavcodec/exr.c
+++ b/libavcodec/exr.c
@@ -1382,6 +1382,7 @@ static int decode_header(EXRContext *s)
                    return AVERROR_PATCHWELCOME;
                }

+                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) {
@@ -1392,6 +1393,7 @@ static int decode_header(EXRContext *s)
                        s->pixel_type                     = current_pixel_type;
                        s->channel_offsets[channel_index] = s->current_channel_offset;
                    }
+                }

                s->channels = av_realloc(s->channels,
                                         ++s->nb_channels * sizeof(EXRChannel));