From 9f4af97aff899571663342fbe68df8caee30097f Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Wed, 23 Jan 2019 00:19:14 +0100 Subject: avcodec/rasc: Move ff_get_buffer() after frame checks If the frame1/2 checks fail this avoids doing the allocation of a new frame Signed-off-by: Michael Niedermayer --- libavcodec/rasc.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'libavcodec') diff --git a/libavcodec/rasc.c b/libavcodec/rasc.c index 6e32c15..21fc43f 100644 --- a/libavcodec/rasc.c +++ b/libavcodec/rasc.c @@ -723,12 +723,12 @@ static int decode_frame(AVCodecContext *avctx, return ret; } - if ((ret = ff_get_buffer(avctx, s->frame, 0)) < 0) - return ret; - if (!s->frame2->data[0] || !s->frame1->data[0]) return AVERROR_INVALIDDATA; + if ((ret = ff_get_buffer(avctx, s->frame, 0)) < 0) + return ret; + copy_plane(avctx, s->frame2, s->frame); if (avctx->pix_fmt == AV_PIX_FMT_PAL8) memcpy(s->frame->data[1], s->frame2->data[1], 1024); -- cgit v1.1