Skip to content
Snippets Groups Projects
Commit 8b58f6b5 authored by Michael Niedermayer's avatar Michael Niedermayer
Browse files

Revert "raw: move buffer size check up."


This reverts commit cc5dd632.
The change was redundant, it has been fixed long ago (422e3a74)

Conflicts:

	libavcodec/rawdec.c

Signed-off-by: default avatarMichael Niedermayer <michaelni@gmx.at>
parent 7f9b42ff
Branches
Tags
No related merge requests found
......@@ -155,9 +155,6 @@ static int raw_decode(AVCodecContext *avctx,
frame->top_field_first = context->tff;
}
if(buf_size < context->length - (avctx->pix_fmt==PIX_FMT_PAL8 ? 256*4 : 0))
return -1;
if (avctx->width <= 0 || avctx->height <= 0) {
av_log(avctx, AV_LOG_ERROR, "w/h is invalid\n");
return AVERROR(EINVAL);
......@@ -190,6 +187,9 @@ static int raw_decode(AVCodecContext *avctx,
avctx->codec_tag == MKTAG('A', 'V', 'u', 'p'))
buf += buf_size - context->length;
if(buf_size < context->length - (avctx->pix_fmt==PIX_FMT_PAL8 ? 256*4 : 0))
return -1;
avpicture_fill(picture, buf, avctx->pix_fmt, avctx->width, avctx->height);
if((avctx->pix_fmt==PIX_FMT_PAL8 && buf_size < context->length) ||
(av_pix_fmt_descriptors[avctx->pix_fmt].flags & PIX_FMT_PSEUDOPAL)) {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment