From patchwork Thu Jan 13 02:05:11 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 33501 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp42282iog; Wed, 12 Jan 2022 18:43:08 -0800 (PST) X-Google-Smtp-Source: ABdhPJxWiUtsNgBgcVwKIiWOAQW4Dhu5fZu/qzXCbwuQBUiVGZ0Go2Mf2vy2Z+FTEFvwZRSzvAka X-Received: by 2002:a17:906:3819:: with SMTP id v25mr1908026ejc.539.1642041788200; Wed, 12 Jan 2022 18:43:08 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1642041788; cv=none; d=google.com; s=arc-20160816; b=thVMFnL5bWx4VCl6kYHv05rnxpEC0L5SYx640dDC6mcFbWaWa/wLCJOITlYMTxhAis rEyQ+g/lahPjdarYmFS5quSnYpPaZgcFy2RpP4vj9fvs4Bn1dFu+XUpYoBGoOBiaZChy zZ/MMdFOP7zeElZUeDKPa0McEPrMZKf5j593rNG3cJNuJWxG2pMnS0VUwY4zqKCJ9XEw BCa7xl3MeElZD1FxJL+Mhnw7iwp4DSVmp1JrLhH/HI4alINJvquzdFW+OmgP7Ic/zvDh OHIJ4GmhGHPtSSkWdCNckm4s5Vw9rVrxoNUV7qs4Mjsk6MmnkbxyLe/suDXY4+sOIidA 42Vw== 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=jcBr5cNgqzJBTF82dZLxMFC/exW57krr41bIWx4ESZg=; b=YZMhT49B3F5LCVjOw/frobnCnQqLlSlrorz1gTGT63fHeFUJenrBZZBuDRjFIzxGRE zSHjybWQHN/9V4hUDdROjkXvN2YuITYjIdle6/E7dGDgTaWAJcGsoJorhbrw3UKLzGSg q37YHGNsEyWlXgitTvv3tODsqn+yzEZfZkqAYoYZJu+F/yb2K5AzH5XgD+tmedV6ujqX Q3th9E7/0dvcmcfxP49yECX3gbGVzg/11hBbAy+OrdZzC+zSFshJoPLd0TEUIfQfVmZj GpwhHD2Gk9zsAenqC6ePINnqZCy9SOZITU22ajET8iDpfEpvP0YfxG8mSKHExuKDyaoc 2ZMw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=mcRkdOl0; 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 jg16si779400ejc.74.2022.01.12.18.43.07; Wed, 12 Jan 2022 18:43:08 -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=mcRkdOl0; 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 981B568B8FC; Thu, 13 Jan 2022 04:06:02 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qt1-f176.google.com (mail-qt1-f176.google.com [209.85.160.176]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CAB9C68B8DE for ; Thu, 13 Jan 2022 04:05:59 +0200 (EET) Received: by mail-qt1-f176.google.com with SMTP id v7so5336535qtw.13 for ; Wed, 12 Jan 2022 18:05:59 -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=VYE3zJ2hbuJhF+YAjo7/QeJCKjcf+pFzJFvet4Y7Gv4=; b=mcRkdOl0Ck4t6JcCYaFq1NCTUxYubVg6CbMa5kda+ytfuptNZyjvmHqqFlUpTv3ILO uCvXpozYO++exc4usDremVfZyr105tdGaf7O1oHberZUjKVmnB2wlaSrmKMARNzbE9Ie KFHSbyDczMCa+Ngl0uZqoLF6qKe042ZkjzBI3abb61AxDXE6toNMgky9uMUNerH3+M/b IrWoZGP3+vfi0OyULLIo7bYHMz3x7SN6Romh0jfYQ+JtDmfmtEt4SQlkpQkOBTgGzq7v eBsNFNdFLRuB720yyomzZDlozibOyF0/qh3r/TvSWD4L97XA11a84dokpEJj+kEzpLjI xFmg== 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=VYE3zJ2hbuJhF+YAjo7/QeJCKjcf+pFzJFvet4Y7Gv4=; b=3ymE9+fTQPq8PsQZZ4K33YTeBGlhPcRVn9FaSb8hZQ5NfHyiMRP/i+0XfRhWpjqHb0 2MCjAJFsLwx7iMwaJ7RX4GsHR02C+E/MGf44qugZe0fO5+AzoPYc3Op39Nv6nShELagB auCVAt/oqvR5AEfOzJ0quGEPA1d1H+wWOxY5LQAkGRLuUf/UXjR5jxZzfxndqvZBBe2l AgRX1CA5wov9XyjTyTq9/nXJr45HIcmW+6577GjsLQiULOSTcD+2lLUhqlL820s2aEg1 PRT2Cr8a6xAUFONCm0crmzcMoMWL01GuGwxkGj2dk5oNKvdX/y4pCBKpkah9WFHy/GTS sY/Q== X-Gm-Message-State: AOAM530c+CuDXTOF2Y02PoOZMXFnU1RSyZy2KzqcYoXZuzMdYxjY7gM1 KdQfXc2cPxKjyfKInZDtQ0//GFJwjUQ= X-Received: by 2002:ac8:ac8:: with SMTP id g8mr2005917qti.29.1642039558350; Wed, 12 Jan 2022 18:05:58 -0800 (PST) Received: from localhost.localdomain ([186.136.131.95]) by smtp.gmail.com with ESMTPSA id k9sm1264556qko.29.2022.01.12.18.05.57 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 Jan 2022 18:05:58 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Wed, 12 Jan 2022 23:05:11 -0300 Message-Id: <20220113020518.730-23-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 232/281] libtwolame: 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: c3X/TrPa5cXX From: Anton Khirnov Signed-off-by: James Almer --- libavcodec/libtwolame.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/libtwolame.c b/libavcodec/libtwolame.c index a71febc91f..9e1d589a0f 100644 --- a/libavcodec/libtwolame.c +++ b/libavcodec/libtwolame.c @@ -76,7 +76,7 @@ static av_cold int twolame_encode_init(AVCodecContext *avctx) twolame_set_copyright(s->glopts, s->copyright); twolame_set_original(s->glopts, s->original); - twolame_set_num_channels(s->glopts, avctx->channels); + twolame_set_num_channels(s->glopts, avctx->ch_layout.nb_channels); twolame_set_in_samplerate(s->glopts, avctx->sample_rate); twolame_set_out_samplerate(s->glopts, avctx->sample_rate);