From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 61BCE4615E for ; Mon, 7 Aug 2023 00:49:59 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id A63E368C73F; Mon, 7 Aug 2023 03:49:57 +0300 (EEST) Received: from relay3-d.mail.gandi.net (relay3-d.mail.gandi.net [217.70.183.195]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4FFA168C4FC for ; Mon, 7 Aug 2023 03:49:51 +0300 (EEST) Received: by mail.gandi.net (Postfix) with ESMTPSA id 8A9B860002 for ; Mon, 7 Aug 2023 00:49:50 +0000 (UTC) From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Mon, 7 Aug 2023 02:49:45 +0200 Message-Id: <20230807004949.31634-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 X-GND-Sasl: michael@niedermayer.cc Subject: [FFmpeg-devel] [PATCH 1/5] avcodec/mv30: Allocate frame later X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: This way we can check the input before allocation in the next commit Signed-off-by: Michael Niedermayer --- libavcodec/mv30.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/libavcodec/mv30.c b/libavcodec/mv30.c index c2d0547053..0b19534b00 100644 --- a/libavcodec/mv30.c +++ b/libavcodec/mv30.c @@ -414,6 +414,9 @@ static int decode_intra(AVCodecContext *avctx, GetBitContext *gb, AVFrame *frame skip_bits_long(gb, s->mode_size * 8); + if ((ret = ff_get_buffer(avctx, frame, AV_GET_BUFFER_FLAG_REF)) < 0) + return ret; + linesize[0] = frame->linesize[0]; linesize[1] = frame->linesize[0]; linesize[2] = frame->linesize[0]; @@ -473,6 +476,9 @@ static int decode_inter(AVCodecContext *avctx, GetBitContext *gb, int ret, cnt = 0; int flags = 0; + if ((ret = ff_get_buffer(avctx, frame, AV_GET_BUFFER_FLAG_REF)) < 0) + return ret; + in_linesize[0] = prev->linesize[0]; in_linesize[1] = prev->linesize[0]; in_linesize[2] = prev->linesize[0]; @@ -610,9 +616,6 @@ static int decode_frame(AVCodecContext *avctx, AVFrame *frame, if ((ret = init_get_bits8(gb, avpkt->data, avpkt->size)) < 0) return ret; - if ((ret = ff_get_buffer(avctx, frame, AV_GET_BUFFER_FLAG_REF)) < 0) - return ret; - s->intra_quant = get_bits(gb, 8); s->inter_quant = s->intra_quant + get_sbits(gb, 8); s->is_inter = get_bits_le(gb, 16); -- 2.17.1 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".