From patchwork Fri Sep 9 18:20:11 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhao Zhili X-Patchwork-Id: 37786 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:139a:b0:8f:1db5:eae2 with SMTP id w26csp816272pzh; Fri, 9 Sep 2022 03:20:30 -0700 (PDT) X-Google-Smtp-Source: AA6agR6L4UtoKIz9wS1JwY6n4NHiL7xBatNvCBpHMRvdUbeCedtjw1yngfQNSsV3gQJ6P8sQpRD4 X-Received: by 2002:a17:906:ee8e:b0:730:4a24:f311 with SMTP id wt14-20020a170906ee8e00b007304a24f311mr9373207ejb.420.1662718829962; Fri, 09 Sep 2022 03:20:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1662718829; cv=none; d=google.com; s=arc-20160816; b=K8jZADmm8p0cLD4o1/WIA/WUkEnhuM+FrvbBt6Ngf3esqt4s1uNKH9qI6xxJlj5pR5 A0w3NRWB9Cw94DkKJWLdSWd4cdCOfxcnZp4RSUwHiW5eE+8HnJxopRZdioMC+CPyVzCv pmAqaW4dzvs0aAi44EwfipZan1lvYmN2p6/eshVrC/dFjug0hJTWzDwE4DfN8EnGwWjB mOyz9LDwQ3eXr3OPjrltj8Vrl6ZxhuhFlfVLMUdLjHfQDvurEXdRxr+fqfeT81nREkVe 2TfR3eFFUtjtdCYtU9fjdkE3pcGOic8qLeBHtoprMkhotbFW7zjZDb9DBhiTXRGPiuiF 2bDQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:date:to:from:message-id :dkim-signature:delivered-to; bh=XBhvBunB0r5P+jk/pKZqiXUPpGBcqgSIB/u+LUygSFg=; b=pyJmu6YEA3XVk/uOEPwqWPX3lz/U34SCg/IZMxSk3q+swoXd8eKe5fC3vyUdjb7vI6 zYzYBXE5lEchf1PEp4TjfCrghr7JB2lygzCFRaGhMfXKjxKbFvcRxVp6aXBxkBEwP3Ns dyEw+ThBEjr0Wd54suhWa5+NijemMqvaQHQjphotSrX2YOSXxN4W0cOAymdrFt6Dp9i4 tdoOQkjHJ5QQ45PXXl1nsqzE7nVTEcUcI51zgg01ZaimH+lfCuD3XifHElePkiZgu+AF 3CrObozjQB9cM9bZ25UQ5PQCyDwdGgI7fvD9GxUeAX1SjXFjFvB5Js0Qv7hzRVsmgxEf r0Vw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@foxmail.com header.s=s201512 header.b=WO1+4Ht3; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=foxmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id z20-20020a05640235d400b00447d3d95e3dsi128544edc.492.2022.09.09.03.20.29; Fri, 09 Sep 2022 03:20:29 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@foxmail.com header.s=s201512 header.b=WO1+4Ht3; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=foxmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4612A68BB07; Fri, 9 Sep 2022 13:20:25 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from out162-62-57-137.mail.qq.com (out162-62-57-137.mail.qq.com [162.62.57.137]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8A66368B59B for ; Fri, 9 Sep 2022 13:20:17 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1662718813; bh=8PPhB8Qce3SeFvMFeF6BEoz3g7tcGaYEGG2Wtbb/X0g=; h=From:To:Cc:Subject:Date; b=WO1+4Ht3amzl7SC49MKSis9Q6qkz+prcIS44NXnu9oKQJ1BETE2yqUkcb1XuA56Yi iO9cuUPeJ/j9MT801o/V9RS7iSNB1ruOgSs44yRistCHXEO2xzkJbD+cratPOuQxR/ LH1QvKlsqnjCzJcUFroThEB5ipm5HgQOdJoaeUp4= Received: from localhost.localdomain ([59.37.125.102]) by newxmesmtplogicsvrsza9.qq.com (NewEsmtp) with SMTP id 50C07C7A; Fri, 09 Sep 2022 18:20:12 +0800 X-QQ-mid: xmsmtpt1662718812tb8rjup41 Message-ID: X-QQ-XMAILINFO: MyIXMys/8kCtL8WOPmjtMIvQkTh5IePSeUEy2SZYw18xtsTDN3Wfar6o2GHOLq VayHK6djdfRgj6S+m963D7YAKsbQU1D6+CqbQLQ9b1erUiccfxgio3u57/PUxkvvuLYFcGHSp+/9 h2BGdny3yIQRM0TsiQSIKdgRsWhXWg2J8NqnFTxQ5vqYeO2dCpk8/t360w1jhx655XD2hNVLNPL+ Oj77j3TZnB2/BckxDJtH4eJmkeMg7XXgNSpG42menzk6Kmm8SVJP6PuBxEtOnFfTfoUnenUTs1i+ k1MfUmanjGiOwwM5DZeSMRrv80oh/crGKOYQPyhjMASspa+BA87vTzxf+vmJPH5+wO4xrMu+/vMA HxS4t8R261CQJSP64/OHXEe33ADQoDEs4uUhjiwJtyhNeZxv6zgGDGPugWFmEz0rIBqakue/l4y9 VFLHj4F8zScjBN7b5fQEK1jdnxoMNX/nLN9G29X7kq0j72XA5t/lhOIFCvnaZ3VrL+ygzlGR+bWf e0EiTNnS1tXQf29m+MO5qBDh2MytB+ghvzIiHCQcP/99eC/SbrMi9RIZ0Y7vO+SksmaqGp54N19L FVbS9+eT0BAejevB1XApqj7gVTl/qj1rNS8l1basLLl2jhpoUUzQDsE55Uknz5x+UoT34XRi9umH 9PVSfpTCkP9oZIJiozFl1zMgPQ5scsGNObiyd6bD5jVSN4MNvTYSGqRqD/nydyc2d6FkzDH+9/cY ggH9UzPOj06Ci36KgdpPngk8RBQWyF8N46EboOytU/u0i7PrJ8l2BidBpb5+BY9zCoE3+uAWeOtp lyhMdDEQI/iokhIYuATOCGFz59/23Im8m7kakD+2o+3Wif8ldLsV0tdYp5hg+SsIFqHbpsQbgc3P U+AUQG+anHJ5+pOlUkHOBR47N8Xi7p6qQy8oLmr5ycX47WJzEzx9pJu7DigQROh5nilXrpscxx5x EyTpVcHbVmJ+N1nQCLbcLHmhOgRTub2c8v0/XgtlKCgUyLEKYaN0dsCYku9UPT From: Zhao Zhili To: ffmpeg-devel@ffmpeg.org Date: Sat, 10 Sep 2022 02:20:11 +0800 X-OQ-MSGID: <20220909182011.44671-1-quinkblack@foxmail.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] swresample/swresample: fix assert failure 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: fTGdxWDGxoOr From: Zhao Zhili Fix #9908. Regression since 8a5896ec1f6. Signed-off-by: Zhao Zhili --- libswresample/swresample.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libswresample/swresample.c b/libswresample/swresample.c index 6f04d130d3..624309c2a0 100644 --- a/libswresample/swresample.c +++ b/libswresample/swresample.c @@ -265,12 +265,14 @@ av_cold int swr_init(struct SwrContext *s){ av_channel_layout_describe(&s->in_ch_layout, l1, sizeof(l1)); av_log(s, AV_LOG_WARNING, "Input channel layout \"%s\" is invalid or unsupported.\n", l1); av_channel_layout_uninit(&s->in_ch_layout); + s->in.ch_count = 0; } if (!av_channel_layout_check(&s->out_ch_layout) || s->out_ch_layout.nb_channels > SWR_CH_MAX) { av_channel_layout_describe(&s->out_ch_layout, l2, sizeof(l2)); av_log(s, AV_LOG_WARNING, "Output channel layout \"%s\" is invalid or unsupported.\n", l2); av_channel_layout_uninit(&s->out_ch_layout); + s->out.ch_count = 0; } switch(s->engine){