virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-10 06:10:52 +02:00
Code Issues Releases Activity

avcodec/exr: fix channel detection

Browse Source
This commit is contained in:
Martin Vignali
2016-04-07 11:17:18 +02:00
committed by Paul B Mahol
parent 7e1e25c2dc
commit 2dd7b46132
1 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/exr.c
View File

@@ -1382,6 +1382,7 @@ static int decode_header(EXRContext *s)
return AVERROR_PATCHWELCOME; return AVERROR_PATCHWELCOME;
} }
if (s->channel_offsets[channel_index] == -1){/* channel have not been previously assign */
if (channel_index >= 0) { if (channel_index >= 0) {
if (s->pixel_type != EXR_UNKNOWN && if (s->pixel_type != EXR_UNKNOWN &&
s->pixel_type != current_pixel_type) { s->pixel_type != current_pixel_type) {
@@ -1392,6 +1393,7 @@ static int decode_header(EXRContext *s)
s->pixel_type = current_pixel_type; s->pixel_type = current_pixel_type;
s->channel_offsets[channel_index] = s->current_channel_offset; s->channel_offsets[channel_index] = s->current_channel_offset;
} }
}
s->channels = av_realloc(s->channels, s->channels = av_realloc(s->channels,
++s->nb_channels * sizeof(EXRChannel)); ++s->nb_channels * sizeof(EXRChannel));