From patchwork Thu Jan 13 01:50:28 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 33350 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp20929iog; Wed, 12 Jan 2022 18:06:09 -0800 (PST) X-Google-Smtp-Source: ABdhPJzadvUAAnSO2BsOd4cfA00aiLWE1DV/x+ahCfS3zu3WXLYKl+eEerAYr+gwl8yTAptPzcKi X-Received: by 2002:a17:906:58c7:: with SMTP id e7mr1880133ejs.146.1642039569306; Wed, 12 Jan 2022 18:06:09 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1642039569; cv=none; d=google.com; s=arc-20160816; b=ox2vb4yKHmzwpXdHk5BlyLD8r7hNSLQYWtFOvJg12FVGDiUDcIG0xb1Mxjd4kRktWl bGijcdRFB0/n0z9tMBGHVUwZ5vdqkHT2LYcGCXYtEsmdTxAVLPfPULnXBGNWpJXPUwaV MOsFfo75QbKEbtXqXilMw0UvzxUiVdwAnh55WISRfdrl4v2jOEQ0oNGHOzFIEl1zwN/g UV3WWfpYoXu3y+5nNULnzD8xCzLBCDUS5MsZffCdFOo4xwO4hRvdZp5hysMnFy8C/Tyv vt0ZbNSuLB5DEBsBSvREJMjJmbXAjewaY4tMiJc3p/cLglv5yeVsP8EVH4PDyW2RZdyJ kUaQ== 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=9Xh0Fcr34n+BiCGpVfENZgNue+RR1hPuYrvwBl30tOQ=; b=cRjK+wkBfDixn9YGb9zsVhDcsf8b62GXT2vYHe7F7MTOThWDKyzGNJTJjXCQZWWi8j Ur2hOsGFbE5uFayZt47s71oD3ryMUc6GjT4rN06fuVMKFZdwwwy/zgKLBcGP0ZbK3SXi eEOF+BkMxesPeq9ZGoiYH4dCRtlUa5IiXw38kkBGhM78vNMtKXe0/htRIq9K/Se+p+LA PyOjWj5J+mwb4yhW6Y12J6WfjedvIcz8fmFgRlYXPpSs3H+FPAmCI1VUJkMly/7bFYVp vQy9gqXWIsU+m17UA2z9fMAu3oBq4YfwNlnVrpIj7q6z5YAF9r2VuMQfHu7UyD0jIZCd N1XQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=e1Jpv2ue; 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 o2si840746edv.551.2022.01.12.18.06.09; Wed, 12 Jan 2022 18:06:09 -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=e1Jpv2ue; 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 AACE068AEDD; Thu, 13 Jan 2022 03:53:24 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qv1-f43.google.com (mail-qv1-f43.google.com [209.85.219.43]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A0F9568B17F for ; Thu, 13 Jan 2022 03:53:21 +0200 (EET) Received: by mail-qv1-f43.google.com with SMTP id p12so5081723qvj.6 for ; Wed, 12 Jan 2022 17:53:21 -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=XrD2WroTN03SRLjTNTORb5Wp9CQvA9PpR2/mIm1gowQ=; b=e1Jpv2ueYpP4GBj7f8RNUSMkBiGigwVRZG/13Dx3fRHk93Tu/Sbnv47GgaSuBqLphs QJ9chXt5vNiMFUfKbsTOoLai4lsaUutCqUZdyyuXGeZJQwJLIeVKNv009mgT69ljYf43 zpJmmwDzOA9ye7GJIXyZfa9DGh7TP6azWhwpVH2EHoC3xLk50uOlwoqOmVeMml3TimFU qoORj4qxWtsA7+mcOjxB8TL36q0UPoonXnAO1dYRpzpZi4AgOrBC4xUcFwmTGaU6l5qW hRU/Uywulm8NGGB/WjMmeOO3DJrIsr06DOkxcJEwCr/Zlsuoixup7rsAZEioAKscGkSi nBhg== 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=XrD2WroTN03SRLjTNTORb5Wp9CQvA9PpR2/mIm1gowQ=; b=Se2RXJLUwXbqy4nUg/AGiDxliZzMw2kafAxO7vU+hsa7lNRGBAtVYi44TKPLoNZoni jky/NhrbfPbKrepq1JXknKoW05JuXOZlAFLszhvg7MqWHZ0oYwR2nXoBWnkeoccZgbIT YnxBO8kZZXJb9HcjjLrsdpEQylFyxEiDzZLEdCCAjRjWnCvXfH7xHMCIO7FrqI2bcnkU vZpn9/2zoVMvl1ww+25d8nYVUC8Zv4Jz/YH381gJ83ZCDpGCv81Fh1nbefC2m/jQf4Zt O2VBVCWFYZhE/WmXKpr4p8ntcD0UuZfvz4RecNvOshj29ixvrBVWjT2Vlv+PvDgF5bw7 hORQ== X-Gm-Message-State: AOAM5307cLWCOvhEZcvzeORWmg1/n71S/A/zNYqaKJ4f3P9xR/SPZhO4 1C38UrIthalJzwZcHHFw23+RtkNI1jw= X-Received: by 2002:a05:6214:d01:: with SMTP id 1mr2181822qvh.34.1642038799997; Wed, 12 Jan 2022 17:53:19 -0800 (PST) Received: from localhost.localdomain ([186.136.131.95]) by smtp.gmail.com with ESMTPSA id i21sm1204710qti.31.2022.01.12.17.53.19 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 Jan 2022 17:53:19 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Wed, 12 Jan 2022 22:50:28 -0300 Message-Id: <20220113015101.4-67-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 066/281] g726: 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: xnk7pKPboils From: Anton Khirnov Signed-off-by: James Almer --- libavformat/g726.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavformat/g726.c b/libavformat/g726.c index 4b08d0a9f7..ce88fe6b23 100644 --- a/libavformat/g726.c +++ b/libavformat/g726.c @@ -42,7 +42,8 @@ static int g726_read_header(AVFormatContext *s) st->codecpar->sample_rate = c->sample_rate; st->codecpar->bits_per_coded_sample = c->code_size; st->codecpar->bit_rate = ((int[]){ 16000, 24000, 32000, 40000 })[c->code_size - 2]; - st->codecpar->channels = 1; + st->codecpar->ch_layout.order = AV_CHANNEL_ORDER_UNSPEC; + st->codecpar->ch_layout.nb_channels = 1; return 0; }