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 7266647CC1 for ; Sun, 17 Dec 2023 11:01:31 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 6982368D149; Sun, 17 Dec 2023 13:01:28 +0200 (EET) Received: from out203-205-251-80.mail.qq.com (out203-205-251-80.mail.qq.com [203.205.251.80]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6602368D13C for ; Sun, 17 Dec 2023 13:01:21 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1702810872; bh=jibjWQUmXBgCjYsWGJ70nbfhX4tHLmfweLRCaSPSJj0=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=shxcpAo5FQVo0bQyqSq4W/bWOaiAh2NLhKdgAmXyIc8GH8wjgOrQkP/y4M3xpSoih ZIFUIVtema3O9lbBm0GcuZXHeuJLvdZsMeQwqqBfbgJYWdzbke0N4XvkUJ/mVXnPzN Qj07+CmYMJ110NXDW7rt0de8Ow+wZHGuQ0+yqzm8= Received: from localhost.localdomain ([113.118.106.67]) by newxmesmtplogicsvrszb6-0.qq.com (NewEsmtp) with SMTP id 4B23E98; Sun, 17 Dec 2023 19:01:11 +0800 X-QQ-mid: xmsmtpt1702810872tg6au08hm Message-ID: X-QQ-XMAILINFO: MesT5uKpDagVDjIdEtcOMAUJMbYWvmR/DVfV5oPBmieFEjJv5Bno3i4jOun8m6 VJcJMj9jnvWNNLgu5L6fBS1L9dtWsCXuJxEWKqjcIgWc0Pr2ePuanWYHv+2Lhh4M3XkeJEEs7Je0 dvTCaC0jP2y9sRxmt+Uok0VS+wdU9FS8kT7wPOz9gCQHj7890mdjIttCwzKJjlwdfTEbZcYBOQrx fiBa3lcdR29RrxTeIFyfV+IL2DhbFWmigwDZJs8uzxh3zpvglKtBKyoE7lYmXhp8gMM2HrXNI6k1 KcqLhPl/vztqp/eA1bTEugOtpBOA2ejuL07QbQwuhj7QJHFWQQdYfIBrOSnM3aEFV5VKc2M2frTN hsHXe2Ia+464SK6Hezz4yEfzW3SJysCseABR1c5vSdjl7x0666H2UKgqT4mO+VuCG8TbjOmjg/IN YH35Swnt6pVDKVHJ0i7y1rfP8u6hy9BKSYAelPTFnAk+yKmqt20L2gw85J1DSaVwow9R4SX0dR3R gRa9JfwSVT+yeses9dXlgsVZT0TlvG9RqtJyX1QmrEpdt+2Ti3tYSfJtaGGEpZAlnRNM3ryASVGR TV1nxgFjgk9bUmja6uRHGSRs2/lQ08m6rflvyZn/hgdTVL90O5OAJ/9TzSLRm5n7eXDMS87XEG91 hTdXeG3spKxHdcq6Ke4uOrzm2pQIktRyHNVDp4e0rUiRaw0jptwE7XmOyPIf6yXmGo0Oops1n9Bx RxtST6s1j4yigFpNufYMbLt/LgznDYiTX76HtPqXL4etM5hakvIUm9v4eOf6SxionNVUeZzuTvxx C4iRepefKEE+be5um7UvovOXt0WQoQ3Ymbz+a95z/3DtJ/DrI4pJ9j6Gc79qqDJoc9/w3I1cnJ81 uO8GO4EuNbqfHrxUx1AIAQItQ6XUm77MzU/Nx3QM/Uo+kk0njjHSGE5KUKex7G8pfrcQQalJuQj0 nnehx3B3BJZTVPthoWtmYfFnCg+mZcnLy2yCeyJTgw4LjeIeY5iA== X-QQ-XMRINFO: OWPUhxQsoeAVDbp3OJHYyFg= From: Zhao Zhili To: ffmpeg-devel@ffmpeg.org Date: Sun, 17 Dec 2023 19:01:09 +0800 X-OQ-MSGID: <20231217110109.264409-2-quinkblack@foxmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231217110109.264409-1-quinkblack@foxmail.com> References: <20231217110109.264409-1-quinkblack@foxmail.com> MIME-Version: 1.0 Subject: [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: 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); enc_ctx->pix_fmt = frame->format; if (ost->bits_per_raw_sample) -- 2.34.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".