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

avcodec/pnm_parser: Factor out next/index compensation

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:43:14 +02:00
parent 1d43d72b18
commit 3fe37033b9
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
libavcodec/pnm_parser.c
View File

@@ -70,19 +70,17 @@ retry:
c = *bs++; c = *bs++;
} else if (c == 'P') { } else if (c == 'P') {
next = bs - pnmctx.bytestream_start + skip - 1; next = bs - pnmctx.bytestream_start + skip - 1;
if (pnmctx.bytestream_start != buf + skip)
next -= pc->index;
break; break;
} }
} }
} else { } else {
next = pnmctx.bytestream - pnmctx.bytestream_start + skip next = pnmctx.bytestream - pnmctx.bytestream_start + skip
+ av_image_get_buffer_size(avctx->pix_fmt, avctx->width, avctx->height, 1); + av_image_get_buffer_size(avctx->pix_fmt, avctx->width, avctx->height, 1);
if (pnmctx.bytestream_start != buf + skip)
next -= pc->index;
if (next > buf_size)
next = END_NOT_FOUND;
} }
if (next != END_NOT_FOUND && pnmctx.bytestream_start != buf + skip)
next -= pc->index;
if (next > buf_size)
next = END_NOT_FOUND;
if (ff_combine_frame(pc, next, &buf, &buf_size) < 0) { if (ff_combine_frame(pc, next, &buf, &buf_size) < 0) {
*poutbuf = NULL; *poutbuf = NULL;