diff options
Diffstat (limited to 'libavcodec/exr.c')
| -rw-r--r-- | libavcodec/exr.c | 25 |
1 files changed, 5 insertions, 20 deletions
diff --git a/libavcodec/exr.c b/libavcodec/exr.c index 53b8e5c7db..407e8a8cbb 100644 --- a/libavcodec/exr.c +++ b/libavcodec/exr.c @@ -352,10 +352,7 @@ static int decode_frame(AVCodecContext *avctx, buf = channel_list_end; continue; - } - - // Process the dataWindow variable - if (check_header_variable(avctx, &buf, buf_end, "dataWindow", "box2i", 31, &variable_buffer_data_size) >= 0) { + } else if (check_header_variable(avctx, &buf, buf_end, "dataWindow", "box2i", 31, &variable_buffer_data_size) >= 0) { if (!variable_buffer_data_size) return AVERROR_INVALIDDATA; @@ -367,10 +364,7 @@ static int decode_frame(AVCodecContext *avctx, buf += variable_buffer_data_size; continue; - } - - // Process the displayWindow variable - if (check_header_variable(avctx, &buf, buf_end, "displayWindow", "box2i", 34, &variable_buffer_data_size) >= 0) { + } else if (check_header_variable(avctx, &buf, buf_end, "displayWindow", "box2i", 34, &variable_buffer_data_size) >= 0) { if (!variable_buffer_data_size) return AVERROR_INVALIDDATA; @@ -379,10 +373,7 @@ static int decode_frame(AVCodecContext *avctx, buf += variable_buffer_data_size; continue; - } - - // Process the lineOrder variable - if (check_header_variable(avctx, &buf, buf_end, "lineOrder", "lineOrder", 25, &variable_buffer_data_size) >= 0) { + } else if (check_header_variable(avctx, &buf, buf_end, "lineOrder", "lineOrder", 25, &variable_buffer_data_size) >= 0) { if (!variable_buffer_data_size) return AVERROR_INVALIDDATA; @@ -393,10 +384,7 @@ static int decode_frame(AVCodecContext *avctx, buf += variable_buffer_data_size; continue; - } - - // Process the pixelAspectRatio variable - if (check_header_variable(avctx, &buf, buf_end, "pixelAspectRatio", "float", 31, &variable_buffer_data_size) >= 0) { + } else if (check_header_variable(avctx, &buf, buf_end, "pixelAspectRatio", "float", 31, &variable_buffer_data_size) >= 0) { if (!variable_buffer_data_size) return AVERROR_INVALIDDATA; @@ -404,10 +392,7 @@ static int decode_frame(AVCodecContext *avctx, buf += variable_buffer_data_size; continue; - } - - // Process the compression variable - if (check_header_variable(avctx, &buf, buf_end, "compression", "compression", 29, &variable_buffer_data_size) >= 0) { + } else if (check_header_variable(avctx, &buf, buf_end, "compression", "compression", 29, &variable_buffer_data_size) >= 0) { if (!variable_buffer_data_size) return AVERROR_INVALIDDATA; |