From patchwork Thu Jan 13 01:55:51 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 33377 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp25822iog; Wed, 12 Jan 2022 18:13:24 -0800 (PST) X-Google-Smtp-Source: ABdhPJx6M3KzQvqEnW64yOAHwR1rkFj/+Avb93XHAAcQhW05+pvoO8t2CitT7qA+dEOzgr5nswFa X-Received: by 2002:a05:6402:4316:: with SMTP id m22mr2334259edc.326.1642040004190; Wed, 12 Jan 2022 18:13:24 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1642040004; cv=none; d=google.com; s=arc-20160816; b=Z731bGlt4ivkru2AR7XmOIwAPBJ+M6ejxbTkmu4R6Pp4jCITc96gRnxudPoWAMWUwR 2y2gI6HG+j9ATeb2jwRQeulSi0P5JnPq+i/siacBHZ2QqXObi+tNOJjUkX1PjDFdS/K7 wqcSMn33ZSnLWTsnQWmHbVG3eSmCVaOLPIgtp5g7Hmleo9afNi+kwoqL7A38KV6M1dio bPVOCznZ74W/IQiEw9Hz0fzeEOxJV1PpSUAUlbyiNRMAh93UdisAol1ioSrvXdEdsa+S nyP8PzuIUJeTusSM6YEO3uzq7GSI55xwo1Mb5tVlV4lFe3ednxXPcIuhY2hE7c/eYnvl vu/A== 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=MLaLZZu9Te1WN+hie5dP9osCSeuk/9T+s2DuhH8i5JQ=; b=zT6tFzkBhuStY/+7mBeNxxyJx7rMAno1LekJObkbH7PqgD8SxDVg3grEIbe61Gl984 sg7m+u1ZENy+DVQeOiYsabR/3PJuWlzwuV9Vn2HH2LlGie9ezf6upZXS9DRvIC1FdGtz oxHlyMFUCWwNQ3fSk/TslSw8PCOEoub4hllCrrHj6HQ2tiLxSib80Tid58thAQBVdCe5 TeukMds2toxQEPQJNfJ2KUpScSuik3jYDaSg/3Js5NwJPKZq/6I3fZp/++07hnN2w9k/ 3bJef50R82ynCybRSfmZJQpTq3fNoBAbvYiDi3FMQDSWOqrSGK8YoZjkAdCd7CaORjUj UnvQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=jnhdBqUq; 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 r12si914066edd.74.2022.01.12.18.13.23; Wed, 12 Jan 2022 18:13:24 -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=jnhdBqUq; 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 1FB0568AF0A; Thu, 13 Jan 2022 03:56:41 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk1-f174.google.com (mail-qk1-f174.google.com [209.85.222.174]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 63A4068AFE2 for ; Thu, 13 Jan 2022 03:56:37 +0200 (EET) Received: by mail-qk1-f174.google.com with SMTP id h16so5599654qkp.3 for ; Wed, 12 Jan 2022 17:56:37 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=quWX1ncRsIOUO9K1EfupWi8HA6vIaG6vTy0teQnnBa4=; b=jnhdBqUqMXiuG3jvEbScjuE5yVQoltI27vzKZyt+uXMSrEuPtbrJx24e1Q777D0TLX 0oObXQYJqJDxqbx0+LzMQNcSxhsnbNKkJHKbuAM8AjAfZHOdtkx+nrs6uTn6LgCfNAlx W5lhuFpH66RkmEiKvRAf58veqRyuoxq7Vatb2VJ5CnVGCejytW4Tm6j+JFzR2LGUGHjQ z75hlhsizgYJD73AvPmhKczNNpc1qNuZlVvPG4aqDykYoR4T4cV96m9ha2LhCHEOFojm dXUAL+8qLcYON7h2MJQp/18FkoB0MdIrdkB5++wHDmGu8VDyNaKRjkdZYcNxJzoN8sm+ WTbw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=quWX1ncRsIOUO9K1EfupWi8HA6vIaG6vTy0teQnnBa4=; b=S4OVqoMoNy0EnoSTutSQ0C+Hafe0eCHQQVK4X1fnjSXDoyuf65g77I8+4FAsjTPaMW TMWJnX8Af+M3fYdbYC/ZaRD2IaDWnTiz0ZwFKLv6cXg92x17ZZBAieMMJJYrISPPhBu7 Rk+4gXyoQ5TazIeJlLdFsM+MZeAq97z/l5tL1rzw0e2LQlvy/sAKV00gTTWy/aEGepVD iqEdob3b0ZKcOveoDUyt0dUop67ESaRCa1c/ptpdEF1887MlaxDXsosZD2HEdcvKwXoT d1zLzkd9IaMARpYt0MDB+QJFrsv2asjQpab+Yt+JAz/gobxMt62FAXwU4lLW0Mcn8rpN WTGA== X-Gm-Message-State: AOAM533qiVb+KBHAfqbksNHBxaHTYnKllG2KpTd5+0B0k5xQaPzrgC4+ xiaFFDZO9J0vtC44UHyZ4Zf7DgPB6eQ= X-Received: by 2002:ae9:c016:: with SMTP id u22mr1226904qkk.395.1642038996213; Wed, 12 Jan 2022 17:56:36 -0800 (PST) Received: from localhost.localdomain ([186.136.131.95]) by smtp.gmail.com with ESMTPSA id t11sm906506qkm.77.2022.01.12.17.56.35 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 Jan 2022 17:56:35 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Wed, 12 Jan 2022 22:55:51 -0300 Message-Id: <20220113015612.448-10-jamrial@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220113015101.4-1-jamrial@gmail.com> References: <20220113015101.4-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 098/281] mp3: convert to new channel layout API 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: 8UWiLiTt1Y4B From: Vittorio Giovara Signed-off-by: Vittorio Giovara Signed-off-by: James Almer --- libavformat/mp3enc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/mp3enc.c b/libavformat/mp3enc.c index 3ff19da274..91874fa14e 100644 --- a/libavformat/mp3enc.c +++ b/libavformat/mp3enc.c @@ -175,7 +175,7 @@ static int mp3_write_xing(AVFormatContext *s) return -1; } - switch (par->channels) { + switch (par->ch_layout.nb_channels) { case 1: channels = MPA_MONO; break; case 2: channels = MPA_STEREO; break; default: av_log(s, AV_LOG_WARNING, "Unsupported number of channels, "