From patchwork Thu Jan 13 01:49:44 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 33312 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp14456iog; Wed, 12 Jan 2022 17:56:19 -0800 (PST) X-Google-Smtp-Source: ABdhPJzR+UU7+XOLfXti9KUZyr6nPRiL8Q3Nl6GamEEqZyYeMlUAAJqQwqm3Lv10q7JMg8rQdYHH X-Received: by 2002:a17:907:7d8a:: with SMTP id oz10mr1865029ejc.320.1642038979219; Wed, 12 Jan 2022 17:56:19 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1642038979; cv=none; d=google.com; s=arc-20160816; b=HH9a/06HSMILNO0lHqjiDSf1BpX74lZSzlYTpLr7OwCoTMV1sD8X0j7yaws7X7bgTc aNtP59Z7CvR/5XKWC7sbZpdMOBmYFBSSVjI59JhykAv0O9zTbtZk5MrKbqR3oxt6cewd PlLd+dqDUpp3ODHfh7p2h5P6gNKcfZ2/MTynQuYk4UQ/239XfJnN5OjtqKjSOVF8zjVs sn61Yh6iJV1wck3o1ylOZTqKnnATnrAtty1stXYAKAJAn6VFUGo4VxVzUnQn2ZlxoTuO BKDKtSsZNXzlKzbUlURPGeuTTZ7r413TCtgXdJumjma4u2T4Il3Tz7ty/zYXOkvrl+hX LQtw== 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=lmT5AHMZWEZCHsw96KgMthvj0aHuk8EIeL5a6AkXFjY=; b=Krh5N9sm3ARUysfk8rftWTYGTBcGCUAjiZI5dxo1KkczvkzhgNSV2o8nWaW0Zn5mik lk9aLkudFjfuBMJtj5PtpqV0CprglwsdXxN711r9Dcpudrk8kjoILwM51reoYbuzQJi0 dUNwBoI81rj2PNEEw1ijtzYbBiVrq+6C4c0oOaAY8KpuMWqQXm5IZ7Ro/EYlxOmjnlr6 npfdCJ32Dlp0uDk9HBXcl56LIoq5MJrLbRoZaaI0sKavOJP+KE8P8F0aBPVH6KvYKYCY UEv+fUNb8MfJ4QhTeJuFA4YFgmaw1XYlagxdeRDjqv6GOSUqaHa/anAFhKxpcT9yREx9 l6vw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=EfeXzTp+; 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 qa31si763977ejc.343.2022.01.12.17.56.18; Wed, 12 Jan 2022 17:56:19 -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=EfeXzTp+; 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 B42D268AF62; Thu, 13 Jan 2022 03:52:29 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qv1-f44.google.com (mail-qv1-f44.google.com [209.85.219.44]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B9D3368AFE1 for ; Thu, 13 Jan 2022 03:52:27 +0200 (EET) Received: by mail-qv1-f44.google.com with SMTP id q4so5080771qvh.9 for ; Wed, 12 Jan 2022 17:52:27 -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=6I68AxTjJTy38HzIFT4OQoLLwWShiZmC3GqMIRKEDHw=; b=EfeXzTp+JA2MphO2V4D7LAtcwGeWe7TyoJ1OZBHX+JfBKxJukjwbJ8IhHfv6K06EcE +cOhdpaeslIqPzVdjGqVF97kCQN+JlSS5Bq5LhQTnCzS1itYi5D3gx7jFrtMOsDMDahc H9GNM60caO05frTo8yKM4BpFNFKLxMf8rtNXEa8n556196p8jXKVG8FMI3JRMgjMFvDT N5fc3JDNYkrlwlTLTRC+PFvLtdfzpTDXhgUxOJa/ZoUEDeIQArs2pbh4SBqFoTqraDeI R35gV1/Hk9UZ1hRID9fwjp8BuG6Xa4PDmWla/JSDLCYyHfodmDgFelG2xHE+tI2qEfZR W6CQ== 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=6I68AxTjJTy38HzIFT4OQoLLwWShiZmC3GqMIRKEDHw=; b=o4HvHbC+tVgiBVBDsxOP02BKmYrrXOyqWi1sHWx2LPnVtgYXytpzIUSM8IUbNQkPg1 q3GiWF2/mek3OfEgMt/eT44W3oAcJdf3I4HK+cbGwsZQ7gYyHSv71spk23r8INOYKsY+ chd12xn+6q3YoD27nlS8sQaqrJUU96YAe0oBR6OH5SVk6eLjGcppfWTMybRb089OHprZ q7C1osGvND3GYBEtzvTLhIPcKqc75aFTLxJYKDad37NVjB4EYhYgCJkBGYaQGb9vH2NT 8tRHJODqaOu4Fip0jpX7BJfgV54HUVDQjeQi1k+VcLG5d+w+NPGk5QfIJd8SsI4HHFbY mWNQ== X-Gm-Message-State: AOAM531SOtRZ0zXaKtVJKysSC9WJjEzVBXKX9zFokwUPaG1XmaxJnPuZ xfs2RRrVp2+fIluAxiGM80V1InsJJn4= X-Received: by 2002:ad4:5aac:: with SMTP id u12mr2186000qvg.8.1642038746397; Wed, 12 Jan 2022 17:52:26 -0800 (PST) Received: from localhost.localdomain ([186.136.131.95]) by smtp.gmail.com with ESMTPSA id i21sm1204710qti.31.2022.01.12.17.52.25 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 Jan 2022 17:52:26 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Wed, 12 Jan 2022 22:49:44 -0300 Message-Id: <20220113015101.4-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 022/281] aixdec: 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: 5fvySUj18/ek From: Anton Khirnov Signed-off-by: James Almer --- libavformat/aixdec.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavformat/aixdec.c b/libavformat/aixdec.c index 59c3d60da3..a1ee370a6d 100644 --- a/libavformat/aixdec.c +++ b/libavformat/aixdec.c @@ -64,7 +64,8 @@ static int aix_read_header(AVFormatContext *s) st->codecpar->codec_type = AVMEDIA_TYPE_AUDIO; st->codecpar->codec_id = AV_CODEC_ID_ADPCM_ADX; st->codecpar->sample_rate = avio_rb32(s->pb); - st->codecpar->channels = avio_r8(s->pb); + st->codecpar->ch_layout.order = AV_CHANNEL_ORDER_UNSPEC; + st->codecpar->ch_layout.nb_channels = avio_r8(s->pb); avpriv_set_pts_info(st, 64, 1, st->codecpar->sample_rate); avio_skip(s->pb, 3); }