From patchwork Fri Feb 17 19:55:04 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 40429 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:5494:b0:bf:7b3a:fd32 with SMTP id i20csp89057pzk; Fri, 17 Feb 2023 11:55:36 -0800 (PST) X-Google-Smtp-Source: AK7set/jrujNDov39cVAjeyMKpmiWEgUYemoR1qJ/AsJVILZ8+ZZDGTPUvs3NfrZCqcisj0jPOs7 X-Received: by 2002:a17:906:27c3:b0:885:2eb5:68a5 with SMTP id k3-20020a17090627c300b008852eb568a5mr295984ejc.66.1676663736675; Fri, 17 Feb 2023 11:55:36 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676663736; cv=none; d=google.com; s=arc-20160816; b=bRQTP9RZXMvMrxQBi9p0VuyTiOdAd7xOhzbJmtrpHcxCMlwPv6KsBCBErTS4ikocc4 dO519XU5c4eZV9+ENPN7C2h2mz0/GT5xVPhd5sxfAcMV0SvMCdIldOHiTvisC9+5hiIL qaqr2xZZTVBA9zOz9ID/rCpilbFa0awVQtpeCyDgqtebv3SZDzAXoaaxYM/SiViZFAD3 Id0vbuoncEHhrbhtOIRmAg/RBQhDH0zOiaXEYs2++mrOrThNPrPBoXFGncTMZtDMr2V4 R+w4O28paVN/YZIwP9gUyKKOrg993O58GbAamp8n6ShEEXgpCclpdJKSLbnRSkYFRvJG BHOA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to; bh=tXOIGpTa7OjtqWrud/TGJJe5B286DD8jwhouK8Noz3Y=; b=0D1GEkJePtZHdAkRbMIBB3E5wLVto3m2ugmNfqu0dQC8LGTnHsRANiqhzZR3PktBnE Tm7xxMDDESPyRGnwLypQFbXpio5RnPx/SzzZEQIXAQfSRY154s5EO2ux11xmeXUGNHba sSGASVeeiTgEMoegCScnvFwjqiuiR4mvTCcIg0VvFkRmgnhPjCi5a1iaPLUCjfaREL0T 3DXjJyfJlAdQfMjLSlA4YqPazy1HVCiG5WZxoHsMszS1ypLvy25AUCS8vx7vipTBdZM8 2rq30rr/y4icf9FYWFD03lu5uNFJX3qgGgR66IPsrq4fqu+ZdjKGYgbokKem58oTZ29Q G5YQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=TiLx7qxT; 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=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id fe17-20020a1709072a5100b00882aebb981asi5486755ejc.444.2023.02.17.11.55.36; Fri, 17 Feb 2023 11:55:36 -0800 (PST) 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=@gmail.com header.s=20210112 header.b=TiLx7qxT; 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=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 07E6368BE76; Fri, 17 Feb 2023 21:55:18 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-oi1-f181.google.com (mail-oi1-f181.google.com [209.85.167.181]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6DE5868BE25 for ; Fri, 17 Feb 2023 21:55:11 +0200 (EET) Received: by mail-oi1-f181.google.com with SMTP id q1so2353974oiv.6 for ; Fri, 17 Feb 2023 11:55:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=XrLr9oBqqe7Vj8tSc4fEo68/U/J8jpUmilYheG1qjjE=; b=TiLx7qxTJH4yj5vb0QKVbpfpbQJF5VOqDE4dpdLL6m2GUHMT9sFml3LwRZ3ekxszXM /9v9UgxHuRAnusSQuzsF8swf7kHEQmvNg6Xfdd6LayIT9tH3W0uYelSVh5/mooZwrERH QbdD41PPlEVZpBLZfZcNb29UQrZbt7h7t3lUcVNIfAfiCy33naYo4Uw893v+XXjc+YDo m7t62jnizpT1DzyxpaCBttagfKx1MUk+npipLYAdykP2Cwu/b8k7ZOnRQYi9Xm1YzdIX xe/ow6jjCs6T9zkEYQiqRZhJplZHm3QfFJ46zhKTkqI2L+bs4xbxkxcaPmZuwk6mwNm6 OMLQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=XrLr9oBqqe7Vj8tSc4fEo68/U/J8jpUmilYheG1qjjE=; b=XOHAwec9swXUwXHokoF7L//Mg58rNjp0kXt2PKcGIGvjegEY+oBJ67FTjD4Sbs4Lza xDf9CFluLJEqt6xoQk77x4twJkizbU2Klj4Dlwm8O6NNTYBJvAO5HSQ1RN+MwSoTBh79 zicxk8D6ii6FF0E09SB9ZSQnhAEcXH2D9+R6N6WM4Ng+32cTB4gVDLo8yjwb16WMJAIK OGptCaj5sAKrIfWCSe47XBNU7fhgd24baY+PLudIbHm4Yy1KgIrWfJUQYEQufEiq48z5 HhvTKTnfI+0LYU+fh4qb+sdo9wpVnH+P4OkbDxEitLUO+n+KG8NZ9PUdxdyJW7qfN68K 64Ww== X-Gm-Message-State: AO0yUKXAufsvG2m3U/L94papLc2Az3fH2zXs0R6X8a7Nbb6DBZdDk+qo 0wWZbclOqhN4L7oWHF//NcMK7SOajXU= X-Received: by 2002:aca:1c04:0:b0:36c:d1c7:ba37 with SMTP id c4-20020aca1c04000000b0036cd1c7ba37mr882732oic.41.1676663709856; Fri, 17 Feb 2023 11:55:09 -0800 (PST) Received: from localhost.localdomain (host197.190-225-105.telecom.net.ar. [190.225.105.197]) by smtp.gmail.com with ESMTPSA id q186-20020acac0c3000000b0037d74967ef6sm2158721oif.44.2023.02.17.11.55.07 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 17 Feb 2023 11:55:08 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Fri, 17 Feb 2023 16:55:04 -0300 Message-Id: <20230217195504.43368-3-jamrial@gmail.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230217195504.43368-1-jamrial@gmail.com> References: <20230217195504.43368-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 3/3] avfilter/af_pan: use the new swr used channel layout option 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: +j/7CGkFQncf Fixes ticket #10180 Signed-off-by: James Almer --- libavfilter/af_pan.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavfilter/af_pan.c b/libavfilter/af_pan.c index 067f646805..4672648d46 100644 --- a/libavfilter/af_pan.c +++ b/libavfilter/af_pan.c @@ -313,7 +313,7 @@ static int config_props(AVFilterLink *link) pan->channel_map[i] = ch_id; } - av_opt_set_int(pan->swr, "uch", pan->nb_output_channels, 0); + av_opt_set_chlayout(pan->swr, "uchl", &pan->out_channel_layout, 0); swr_set_channel_mapping(pan->swr, pan->channel_map); } else { // renormalize