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 4D1284880C for ; Mon, 18 Dec 2023 11:21:54 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 1EE2B68D21F; Mon, 18 Dec 2023 13:21:53 +0200 (EET) Received: from mail0.khirnov.net (red.khirnov.net [176.97.15.12]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3B67368D20B for ; Mon, 18 Dec 2023 13:21:47 +0200 (EET) Received: from localhost (localhost [IPv6:::1]) by mail0.khirnov.net (Postfix) with ESMTP id 030D62405ED; Mon, 18 Dec 2023 12:21:47 +0100 (CET) Received: from mail0.khirnov.net ([IPv6:::1]) by localhost (mail0.khirnov.net [IPv6:::1]) (amavis, port 10024) with ESMTP id EXVJ81ug2rC6; Mon, 18 Dec 2023 12:21:46 +0100 (CET) Received: from lain.khirnov.net (lain.khirnov.net [IPv6:2001:67c:1138:4306::3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "lain.khirnov.net", Issuer "smtp.khirnov.net SMTP CA" (verified OK)) by mail0.khirnov.net (Postfix) with ESMTPS id 805AB2400AC; Mon, 18 Dec 2023 12:21:46 +0100 (CET) Received: by lain.khirnov.net (Postfix, from userid 1000) id 5DA4B1601B9; Mon, 18 Dec 2023 12:21:46 +0100 (CET) From: Anton Khirnov To: FFmpeg development discussions and patches In-Reply-To: References: <20231217110109.264409-1-quinkblack@foxmail.com> Mail-Followup-To: FFmpeg development discussions and patches , Zhao Zhili Date: Mon, 18 Dec 2023 12:21:46 +0100 Message-ID: <170289850635.8914.13784988004953805798@lain.khirnov.net> User-Agent: alot/0.8.1 MIME-Version: 1.0 Subject: Re: [FFmpeg-devel] [PATCH 2/2] fftools/ffmpeg_enc: assert frame->format isn't NONE before use 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 Cc: Zhao Zhili 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: Quoting Zhao Zhili (2023-12-17 12:01:09) > From: Zhao Zhili > > Signed-off-by: Zhao Zhili > --- > fftools/ffmpeg_enc.c | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/fftools/ffmpeg_enc.c b/fftools/ffmpeg_enc.c > index 9141dab6a4..ac38e8db75 100644 > --- a/fftools/ffmpeg_enc.c > +++ b/fftools/ffmpeg_enc.c > @@ -206,6 +206,7 @@ int enc_open(void *opaque, const AVFrame *frame) > > switch (enc_ctx->codec_type) { > case AVMEDIA_TYPE_AUDIO: > + av_assert0(frame->format != AV_SAMPLE_FMT_NONE); > enc_ctx->sample_fmt = frame->format; > enc_ctx->sample_rate = frame->sample_rate; > ret = av_channel_layout_copy(&enc_ctx->ch_layout, &frame->ch_layout); > @@ -227,6 +228,7 @@ int enc_open(void *opaque, const AVFrame *frame) > av_mul_q(ost->frame_aspect_ratio, (AVRational){ enc_ctx->height, enc_ctx->width }) : > frame->sample_aspect_ratio; > > + av_assert0(frame->format != AV_PIX_FMT_NONE); I'd prefer if you did this at the top of the block, right after case. Can also check dimensions for video and sample rate/channel layout for audio. -- Anton Khirnov _______________________________________________ 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".