Skip to content

F
ffmpeg.wasm-core
Commit 3c6d824b authored by Michael Niedermayer's avatar Michael Niedermayer
Browse files
Options

avcodec/bmp_parser: simplify 

Signed-off-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parent b11d1889
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 5 deletions
libavcodec/bmp_parser.c
View file @ 3c6d824b
...@@ -46,6 +46,7 @@ static int bmp_parse(AVCodecParserContext *s, AVCodecContext *avctx, ...@@ -46,6 +46,7 @@ static int bmp_parse(AVCodecParserContext *s, AVCodecContext *avctx,
*poutbuf_size = 0; *poutbuf_size = 0;
restart:
if (bpc->pc.frame_start_found <= 2+4+4) { if (bpc->pc.frame_start_found <= 2+4+4) {
for (; i < buf_size; i++) { for (; i < buf_size; i++) {
state = (state << 8) | buf[i]; state = (state << 8) | buf[i];
...@@ -64,11 +65,8 @@ static int bmp_parse(AVCodecParserContext *s, AVCodecContext *avctx, ...@@ -64,11 +65,8 @@ static int bmp_parse(AVCodecParserContext *s, AVCodecContext *avctx,
if (bpc->fsize <= ihsize + 14) if (bpc->fsize <= ihsize + 14)
bpc->fsize = INT_MAX/2; bpc->fsize = INT_MAX/2;
bpc->pc.frame_start_found++; bpc->pc.frame_start_found++;
if (bpc->fsize > buf_size - i + 17) bpc->remaining_size = bpc->fsize + i - 17;
bpc->remaining_size = bpc->fsize - buf_size + i - 17; goto restart;
else
next = bpc->fsize + i - 17;
break;
} else if (bpc->pc.frame_start_found) } else if (bpc->pc.frame_start_found)
bpc->pc.frame_start_found++; bpc->pc.frame_start_found++;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment