highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

exr: merge multiple if () blocks

Browse Source 
Remove useless comments.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
This commit is contained in:
Paul B Mahol
2013-02-20 10:44:39 +00:00
parent 3456891291
commit 88d7259fd2
1 changed files with 5 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
libavcodec/exr.c
View File

@@ -352,10 +352,7 @@ static int decode_frame(AVCodecContext *avctx,
buf = channel_list_end; buf = channel_list_end;
continue; continue;
} } else if (check_header_variable(avctx, &buf, buf_end, "dataWindow", "box2i", 31, &variable_buffer_data_size) >= 0) {
// Process the dataWindow variable
if (check_header_variable(avctx, &buf, buf_end, "dataWindow", "box2i", 31, &variable_buffer_data_size) >= 0) {
if (!variable_buffer_data_size) if (!variable_buffer_data_size)
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
@@ -367,10 +364,7 @@ static int decode_frame(AVCodecContext *avctx,
buf += variable_buffer_data_size; buf += variable_buffer_data_size;
continue; continue;
} } else if (check_header_variable(avctx, &buf, buf_end, "displayWindow", "box2i", 34, &variable_buffer_data_size) >= 0) {
// Process the displayWindow variable
if (check_header_variable(avctx, &buf, buf_end, "displayWindow", "box2i", 34, &variable_buffer_data_size) >= 0) {
if (!variable_buffer_data_size) if (!variable_buffer_data_size)
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
@@ -379,10 +373,7 @@ static int decode_frame(AVCodecContext *avctx,
buf += variable_buffer_data_size; buf += variable_buffer_data_size;
continue; continue;
} } else if (check_header_variable(avctx, &buf, buf_end, "lineOrder", "lineOrder", 25, &variable_buffer_data_size) >= 0) {
// Process the lineOrder variable
if (check_header_variable(avctx, &buf, buf_end, "lineOrder", "lineOrder", 25, &variable_buffer_data_size) >= 0) {
if (!variable_buffer_data_size) if (!variable_buffer_data_size)
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
@@ -393,10 +384,7 @@ static int decode_frame(AVCodecContext *avctx,
buf += variable_buffer_data_size; buf += variable_buffer_data_size;
continue; continue;
} } else if (check_header_variable(avctx, &buf, buf_end, "pixelAspectRatio", "float", 31, &variable_buffer_data_size) >= 0) {
// Process the pixelAspectRatio variable
if (check_header_variable(avctx, &buf, buf_end, "pixelAspectRatio", "float", 31, &variable_buffer_data_size) >= 0) {
if (!variable_buffer_data_size) if (!variable_buffer_data_size)
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
@@ -404,10 +392,7 @@ static int decode_frame(AVCodecContext *avctx,
buf += variable_buffer_data_size; buf += variable_buffer_data_size;
continue; continue;
} } else if (check_header_variable(avctx, &buf, buf_end, "compression", "compression", 29, &variable_buffer_data_size) >= 0) {
// Process the compression variable
if (check_header_variable(avctx, &buf, buf_end, "compression", "compression", 29, &variable_buffer_data_size) >= 0) {
if (!variable_buffer_data_size) if (!variable_buffer_data_size)
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;