From patchwork Thu Jan 13 02:06: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: 33511 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp43964iog; Wed, 12 Jan 2022 18:46:23 -0800 (PST) X-Google-Smtp-Source: ABdhPJwPQELjV5fdnf5Hyf1vbr7++3LMh932ah+UMg1NDSqb5f9iR6/plkSpbipGBP7M6AF6P30b X-Received: by 2002:a17:907:6e18:: with SMTP id sd24mr1987650ejc.90.1642041983451; Wed, 12 Jan 2022 18:46:23 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1642041983; cv=none; d=google.com; s=arc-20160816; b=agD1en4R9VVQjMlKtlfWgmvMWCTEKkmnof9oBqDKrTma40UhHk6rvIeNkAn4zLpWDU BLIMRJMV6p23rxynklLoZ684qEbN5FU4g7VobW0sUBotmUie6RgKwF+PKOseCtpRaEp9 c2YdkW0zdBkdFCsjgHUP6uuqtx3ln8Cj0hoA0ycMVX4xD0DJAwOx0GAsB8taVJmcRwYd qfmx6LbYlWhyeQptyPOphoUZYQVQ2/iko9L+ScqXnG1xkIQ2S/ikY4XqRAr7rlAAHb7m Ui5Hw8fwyl13e/mdVunfDfEFHytIl8S8dNmBQeSIeUghcLiYJCFAE75pNtx38aN5mqH6 BI4Q== 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=/2o5V6Tfxd3DBiL4TIyupTxVAlC8ULxW7jxBv5mIOuw=; b=vIM35xwsqNgHgfFUZPaa2exgMESyahSKX0tZ0c1+3vQkjyCaSIZ0wYo4DYFrWe/aI1 qnMyBM92NczL4hmejDhyYhDiW51v9kQELkO793ANxMZ34NR2DEbdTGIScr7iGtK3RRZB p4WAoEAUB89V70x1fID3J/XhfrRuWcOp/dbT5AqtwcdJFg/EDPhrthBaUIW/2siPYNXR y03JiSdVLUwO7EmpbOCFHTk5UAvIPSraxhjI7pktPmec82YmJb8xA/8uetIh01+E9uR0 HcM7uUyQ8imW4lExLXt0Hsm0m/s/MqtwC3dSvpXrFOMRbRwN8F1vz24mOeDiHdGCKwVi 7wlQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=pCazKQl0; 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 sg35si859337ejc.253.2022.01.12.18.46.23; Wed, 12 Jan 2022 18:46:23 -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=pCazKQl0; 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 DFA4868B995; Thu, 13 Jan 2022 04:07:41 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk1-f169.google.com (mail-qk1-f169.google.com [209.85.222.169]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3ECE168B979 for ; Thu, 13 Jan 2022 04:07:37 +0200 (EET) Received: by mail-qk1-f169.google.com with SMTP id z10so1236671qkf.7 for ; Wed, 12 Jan 2022 18:07: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=8O5rdyRRZ0WhGmCdZtCXqRsjk2vG2hHQVLb8F9WG/gk=; b=pCazKQl0tNXRInAkSVpsT48e0nmPGJcBhfTiCotLsHnZ/73+z9cA0Cz+quR+rv0XOC 0/fq0ujLfT94/siOKWNyIyi9ZeHDn+jfb7FNzI/s/9UueSG5f9xfYMG063gpMig0bZUn QS9zbr3iApX6r+c8SmYOj6hbfbDR9mXICMUqOouPmhuy9PxRIJIqTY3ks88hUlTl4XI1 ufRV7cfJ3DoIVVBxnAQYY3+Qt2Sy9UPsyTxhbrUNKMl2tSFDbSCXxqNIx/h/8AXSkM4k hiWdnmURL38sqjudfKMND3kCsoQvH01nZKFTKHu0o1O+PfgHCKhVZ3LI8NXVnFpL87xi Zzdg== 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=8O5rdyRRZ0WhGmCdZtCXqRsjk2vG2hHQVLb8F9WG/gk=; b=dJQzZzd9kAaOICWi+gUqUGKaONF/pMi0PqsoOlCwjUgIgUCZRhAhHG9vcvGErrO09h AlYBDXQQQxUna1GVY78fjfJAeIK4etjvJw9ZNsad8QlHxQTQzXYUi7rUKjEzTRpBp6Y4 Xm18dZAmGM2K4fJ1BoA7zCi5jeqgs32ZKVPe+YqC5z+xJNJuqaDtNsAXy0ME4481YiKI pEfhyDaTIYZo5/yxSglzIUM8/3HRgm6TWpW6Z2uto3BBORJzf6YCwvfphqhApiKD/WT5 /nuREXdKZUeqxuoFonHFXVzah9tRt4kAxeaLOeEtrud2Av2bAVO68AOrlq1RQy4pMS7W sF8Q== X-Gm-Message-State: AOAM530zFu3WT0k0OOO8KaitgSHOMDpE7h9VYhY6z8PFhUxOnsdYb6ff xT7pmpBN71A/+pZJhRvzC/CR1J/3080= X-Received: by 2002:a05:620a:15af:: with SMTP id f15mr1839832qkk.18.1642039655830; Wed, 12 Jan 2022 18:07:35 -0800 (PST) Received: from localhost.localdomain ([186.136.131.95]) by smtp.gmail.com with ESMTPSA id a16sm1085946qta.13.2022.01.12.18.07.34 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 Jan 2022 18:07:35 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Wed, 12 Jan 2022 23:06:51 -0300 Message-Id: <20220113020713.801-8-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 247/281] qcelpdec: 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: vlmkPHZF2E6K From: Anton Khirnov Signed-off-by: Vittorio Giovara Signed-off-by: James Almer --- libavcodec/qcelpdec.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/qcelpdec.c b/libavcodec/qcelpdec.c index b23013816b..9f3ef309db 100644 --- a/libavcodec/qcelpdec.c +++ b/libavcodec/qcelpdec.c @@ -87,8 +87,8 @@ static av_cold int qcelp_decode_init(AVCodecContext *avctx) QCELPContext *q = avctx->priv_data; int i; - avctx->channels = 1; - avctx->channel_layout = AV_CH_LAYOUT_MONO; + av_channel_layout_uninit(&avctx->ch_layout); + avctx->ch_layout = (AVChannelLayout)AV_CHANNEL_LAYOUT_MONO; avctx->sample_fmt = AV_SAMPLE_FMT_FLT; for (i = 0; i < 10; i++)