It allows to save one level of indentation.
Signed-off-by: Andreas Rheinhardt <andreas.rheinha...@outlook.com>
---
libavcodec/iff.c | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/libavcodec/iff.c b/libavcodec/iff.c
index f14644471b..13912e9133 100644
--- a/libavcodec/iff.c
+++ b/libavcodec/iff.c
@@ -223,7 +223,9 @@ static int extract_header(AVCodecContext *const avctx)
return AVERROR_INVALIDDATA;
}
- if (buf_size >= 41) {
+ if (buf_size < 41)
+ return 0;
+
s->compression = bytestream_get_byte(&buf);
s->bpp = bytestream_get_byte(&buf);
s->ham = bytestream_get_byte(&buf);
@@ -316,7 +318,6 @@ static int extract_header(AVCodecContext *const avctx)
s->ham_palbuf[(1 << s->bpp) + i] = s->ham_palbuf[i] |
0xFF000000;
}
}
- }
return 0;
}
@@ -1470,10 +1471,12 @@ static int parse_packet_header(AVCodecContext *const
avctx,
IffContext *s = avctx->priv_data;
int i;
- if (avctx->codec_tag == MKTAG('A', 'N', 'I', 'M')) {
uint32_t chunk_id;
uint64_t data_size;
+ if (avctx->codec_tag != MKTAG('A', 'N', 'I', 'M'))
+ return 0;
+
bytestream2_skip(gb, 4);
while (bytestream2_get_bytes_left(gb) >= 1) {
chunk_id = bytestream2_get_le32(gb);
@@ -1517,7 +1520,6 @@ static int parse_packet_header(AVCodecContext *const
avctx,
bytestream2_skip(gb, data_size + (data_size&1));
}
}
- }
return 0;
}
--
2.34.1
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".
