virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-07-11 14:30:22 +02:00
Code Issues Releases Activity

avcodec/iff: Return early when possible

Browse Source 
It allows to save one level of indentation.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
This commit is contained in:
Andreas Rheinhardt
2022-07-11 20:01:56 +02:00
parent 46b586e5b2
commit d0df74553b
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
libavcodec/iff.c
View File

@ -222,7 +222,9 @@ static int extract_header(AVCodecContext *const avctx)
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
} }
if (buf_size >= 41) { if (buf_size < 41)
return 0;
s->compression = bytestream_get_byte(&buf); s->compression = bytestream_get_byte(&buf);
s->bpp = bytestream_get_byte(&buf); s->bpp = bytestream_get_byte(&buf);
s->ham = bytestream_get_byte(&buf); s->ham = bytestream_get_byte(&buf);
@ -315,7 +317,6 @@ static int extract_header(AVCodecContext *const avctx)
s->ham_palbuf[(1 << s->bpp) + i] = s->ham_palbuf[i] | 0xFF000000; s->ham_palbuf[(1 << s->bpp) + i] = s->ham_palbuf[i] | 0xFF000000;
} }
} }
}
return 0; return 0;
} }
@ -1469,10 +1470,12 @@ static int parse_packet_header(AVCodecContext *const avctx,
IffContext *s = avctx->priv_data; IffContext *s = avctx->priv_data;
int i; int i;
if (avctx->codec_tag == MKTAG('A', 'N', 'I', 'M')) {
uint32_t chunk_id; uint32_t chunk_id;
uint64_t data_size; uint64_t data_size;
if (avctx->codec_tag != MKTAG('A', 'N', 'I', 'M'))
return 0;
bytestream2_skip(gb, 4); bytestream2_skip(gb, 4);
while (bytestream2_get_bytes_left(gb) >= 1) { while (bytestream2_get_bytes_left(gb) >= 1) {
chunk_id = bytestream2_get_le32(gb); chunk_id = bytestream2_get_le32(gb);
@ -1516,7 +1519,6 @@ static int parse_packet_header(AVCodecContext *const avctx,
bytestream2_skip(gb, data_size + (data_size&1)); bytestream2_skip(gb, data_size + (data_size&1));
} }
} }
}
return 0; return 0;
} }