virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-10 06:10:52 +02:00
Code Issues Releases Activity

avcodec/pnm_parser: Factor next initialization out

Browse Source 
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer
2019-04-06 14:41:33 +02:00
parent 7f3d39b21f
commit 1d43d72b18
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
libavcodec/pnm_parser.c
View File

@@ -47,6 +47,7 @@ retry:
pnmctx.bytestream = (uint8_t *) buf + skip; /* casts avoid warnings */ pnmctx.bytestream = (uint8_t *) buf + skip; /* casts avoid warnings */
pnmctx.bytestream_end = (uint8_t *) buf + buf_size - skip; pnmctx.bytestream_end = (uint8_t *) buf + buf_size - skip;
} }
next = END_NOT_FOUND;
if (ff_pnm_decode_header(avctx, &pnmctx) < 0) { if (ff_pnm_decode_header(avctx, &pnmctx) < 0) {
if (pnmctx.bytestream < pnmctx.bytestream_end) { if (pnmctx.bytestream < pnmctx.bytestream_end) {
if (pc->index) { if (pc->index) {
@@ -58,12 +59,10 @@ retry:
} }
goto retry; goto retry;
} }
next = END_NOT_FOUND;
} else if (pnmctx.type < 4) { } else if (pnmctx.type < 4) {
uint8_t *bs = pnmctx.bytestream; uint8_t *bs = pnmctx.bytestream;
const uint8_t *end = pnmctx.bytestream_end; const uint8_t *end = pnmctx.bytestream_end;
next = END_NOT_FOUND;
while (bs < end) { while (bs < end) {
int c = *bs++; int c = *bs++;
if (c == '#') { if (c == '#') {