From patchwork Thu Jan 13 01:49:50 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 33318 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp15205iog; Wed, 12 Jan 2022 17:57:38 -0800 (PST) X-Google-Smtp-Source: ABdhPJztBIKB7cCP+E9CCImbGT0lwLZM+zokmBnCxYXq6+95h3LTlstHz6qKVfwjDMsqpsh0NuBj X-Received: by 2002:a17:907:3f83:: with SMTP id hr3mr1964186ejc.604.1642039058306; Wed, 12 Jan 2022 17:57:38 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1642039058; cv=none; d=google.com; s=arc-20160816; b=pZIsEM82PfNQaoIczbsI+oTC9F8na/QWWD9vnrPXE/Qt+MCHkRVoHKs6a9ZWXObvfS AKqIVbxGmUbMeVe/WOsE1b1f/ihrJ+FqcD3N/YGVsCdEgcJxXKsInscpR9hxCTxI2pnB f58EomzTvqXMLxTpPPu0nEEmFLYrWi7PlS/0aVa2u8nNV6sU+sWUu9zzYxJk1xqpoBjY p6M81d3OjQUHThdw/d3LcUEzKhD7A/nhYfOSZ2GGHVt3Lt6r9Eg+eFbPdnDgf397e+hN 3ePc/AieUS5ANC4GTAiQcMPmP1KyMXx01NwyRvA5OJw0xTGu2P2gwBVyVZM/rYohVATl ncOA== 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=yXs5C0lVhQV7xDUnD5J58qckT/yjqtwz0CHSYK0MVJ0=; b=0BOm0BbACZmIu/yKDxWJ4rMNeEgmI9szT16b3O7ECDR0PAsfyLVED2PLC4PKgm6C5J ICJrR+SKmBeObv5urxU31B9j7vt1hUXQcpKZHOqSaMoRWc+XASv9/BeBZ6TBX5YrxA9I kP1+Eqdm+hrjnvo4KFnhZAmvKQ+WW1oR8xaz+2HAMfahLhOVwo4ZfNM2eEBF26d1tbC4 BJmhot7Vz5wNKf40B3+6ajCj8hpKssbPaPNXLXntH7ktMrrMPSthiyH3mSBW+Szn/Odk 94n/nc30CPHuOiVr6ylpqnHmyycq9FB750pDz2zON+6NuW+sy5gRbs6bYesW/HOTu1rK c+3w== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b="LfSNpl/F"; 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 y12si838469edd.119.2022.01.12.17.57.37; Wed, 12 Jan 2022 17:57:38 -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="LfSNpl/F"; 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 523E168B02B; Thu, 13 Jan 2022 03:52:38 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qt1-f174.google.com (mail-qt1-f174.google.com [209.85.160.174]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8684568B00E for ; Thu, 13 Jan 2022 03:52:35 +0200 (EET) Received: by mail-qt1-f174.google.com with SMTP id l17so5321876qtk.7 for ; Wed, 12 Jan 2022 17:52:35 -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=3FBCgmONLPakweQJmxMuZNs80eSg4dGf4Q/wG9cqB28=; b=LfSNpl/FBDb5ZEy8/E4Ytx81o7mNICbVENl2zmo7+xn5tIU9avSoSdFD0+3A4S6sHP LaAjT4MX++dEUDqBGWNsSbUPLYiJVMdsBXhp1hMAkWeIikAc077prhxx/klbLL5mhvhJ G9vW/b36p2lpRdP+EgKgRXjXpfxngDjwB8OTEIMRzfkHUcbvgfgExptYBimRGEGVFjqD SpkvCnVQ2cj4iQ0B19PE3V5waaL4LMvm8zP+mrKHo+PWTA+pbXhCdRkdR0HBxNuOYiTF 5dcWMh7URJmn3329Eekn7vIIh/kLYCdx7h7etEcA5AMpMXWd/1YYgb0S4Q3oAN0/vKRt MuAQ== 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=3FBCgmONLPakweQJmxMuZNs80eSg4dGf4Q/wG9cqB28=; b=HujMgl50WOHqjV6txNLivYVeYU0GuF2q42rTHmHPoHGUhKDzCw+SRx3K6r6fS3XBnY o4NN9yHUPmY4SUtZqoNa1f0w1G2xIcxjdDvoucAtK/J+4mRgd5jbuHm8CYX9UCMh2/xD ubKZV+dW78WBf9N0xnVRoBFAIYFo8TJSF4zFJNlcML0o/8JC1/5vPW3pDFx4U+x/QaC1 +p/ZVXVRDvXHx5iviJyOY9P5zojhFbnolv86dZ3Mz9+tS79CDegdnQl13ABE5sHaGogX QJZO0IhFa/tsRbOqnLHeyKRrzZiDjbxgOk30gW4Pzcx+nNDh2jaZwBL64zmK2VaoLmEW LrRQ== X-Gm-Message-State: AOAM532lG7ZzHUNgT+WaEJUKZeWm4GcNbM19MpN3X8Wskt32vDo0++vV lXX5HLxBZihEImL7Rr7vXRcsXycjE7M= X-Received: by 2002:ac8:5809:: with SMTP id g9mr1991593qtg.312.1642038753826; Wed, 12 Jan 2022 17:52:33 -0800 (PST) Received: from localhost.localdomain ([186.136.131.95]) by smtp.gmail.com with ESMTPSA id i21sm1204710qti.31.2022.01.12.17.52.32 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 Jan 2022 17:52:33 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Wed, 12 Jan 2022 22:49:50 -0300 Message-Id: <20220113015101.4-29-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 028/281] ape: 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: vdzKoQBRQHGI From: Vittorio Giovara Signed-off-by: Vittorio Giovara Signed-off-by: James Almer --- libavformat/ape.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavformat/ape.c b/libavformat/ape.c index b1222d9ce0..a6029affed 100644 --- a/libavformat/ape.c +++ b/libavformat/ape.c @@ -331,7 +331,8 @@ static int ape_read_header(AVFormatContext * s) st->codecpar->codec_type = AVMEDIA_TYPE_AUDIO; st->codecpar->codec_id = AV_CODEC_ID_APE; st->codecpar->codec_tag = MKTAG('A', 'P', 'E', ' '); - st->codecpar->channels = ape->channels; + st->codecpar->ch_layout.order = AV_CHANNEL_ORDER_UNSPEC; + st->codecpar->ch_layout.nb_channels = ape->channels; st->codecpar->sample_rate = ape->samplerate; st->codecpar->bits_per_coded_sample = ape->bps;