From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <ffmpeg-devel-bounces@ffmpeg.org>
Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100])
	by master.gitmailbox.com (Postfix) with ESMTP id 3309742CDD
	for <ffmpegdev@gitmailbox.com>; Thu, 13 Jan 2022 02:02:20 +0000 (UTC)
Received: from [127.0.1.1] (localhost [127.0.0.1])
	by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id B3C0168B0D5;
	Thu, 13 Jan 2022 03:53:03 +0200 (EET)
Received: from mail-qt1-f171.google.com (mail-qt1-f171.google.com
 [209.85.160.171])
 by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id AB1E268B0B8
 for <ffmpeg-devel@ffmpeg.org>; Thu, 13 Jan 2022 03:53:00 +0200 (EET)
Received: by mail-qt1-f171.google.com with SMTP id q14so5300606qtx.10
 for <ffmpeg-devel@ffmpeg.org>; Wed, 12 Jan 2022 17:53:00 -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=veXABjlFttR/9y66ufp6cpinTaGC+F09pLeaqYh+6/Q=;
 b=Akgk3Hk5kPeNrIYodeocbN5keRmazIo9d6bA7AHVKT3CNSeGIpf5MsBC1PjghscU+e
 44Cm0rqm52vi5O78DBy8WU/0zd6IK+LBWKVKMI5rSQP6EiBqID2ti/WzjOWWQbIGrjFv
 zsyceNIzzsP0yhiidWOsOyuPVX/fo51cYG49eTOh4Uo56lgiYg1cJGPtw58Tyutvnknk
 myAHO7jXvZ8ePhgjzyEeGWvHa5L6CK5PGJ2A+kI74J8S3ksfWF+s6BvHKvdrHqVHc1hO
 U2I3PLMxYKq62dTo2yy4LRmTTwRDu9VHvQVoDWRNz77PNHM13ZUldsv/4rciFFYdOogX
 7xPg==
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=veXABjlFttR/9y66ufp6cpinTaGC+F09pLeaqYh+6/Q=;
 b=yZpNahqfnleFATcErZbAxzS/Z6yHxpONFGL3A5Fr4nGE0aYO48OFjtB9ZTZ2G0UJZD
 ZTloJioOwKMWF1GpxoDhaPuTrNKO+03+5GXPLJbjf8Vqs+ECHJVvIOE8wWKc7Qwz+LSF
 E6cb2wOH7zNSllz3AvBP7gSsEvkG8gYHNTDfsdYJLwPGatPI9FaQucH7rW0OOfn80rMf
 CAzVK1HIvPYN+ITAFfJEKSTm+Fbvu98ptvXsXZQxs0raLlRYK58TbN2344C4ikzgzOLl
 xfsVFsLWjhAXbBq96N75ENNGIQV2ew2vyvpHeWIELsbqdE6X6IT4xHbS4il6sPzmNsKr
 9Gww==
X-Gm-Message-State: AOAM531kx2sykzRINYNAjiQTnY50nyIiGYm5eUaGf7UXagJnrOLJew0W
 zd+rnePVdOgP27faUTkIQHJJr2HxFtI=
X-Google-Smtp-Source: ABdhPJxsU74JmJagatd+a2FL8i+rtgBuYryVsQ3YguK1QnQ1gQ7AbCIXEVYWrSgOcFey/H1TBxfrjA==
X-Received: by 2002:a05:622a:2ca:: with SMTP id
 a10mr1991726qtx.483.1642038779015; 
 Wed, 12 Jan 2022 17:52:59 -0800 (PST)
Received: from localhost.localdomain ([186.136.131.95])
 by smtp.gmail.com with ESMTPSA id i21sm1204710qti.31.2022.01.12.17.52.58
 for <ffmpeg-devel@ffmpeg.org>
 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
 Wed, 12 Jan 2022 17:52:58 -0800 (PST)
From: James Almer <jamrial@gmail.com>
To: ffmpeg-devel@ffmpeg.org
Date: Wed, 12 Jan 2022 22:50:11 -0300
Message-Id: <20220113015101.4-50-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 049/281] dtshddec: 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 <ffmpeg-devel.ffmpeg.org>
List-Unsubscribe: <https://ffmpeg.org/mailman/options/ffmpeg-devel>,
 <mailto:ffmpeg-devel-request@ffmpeg.org?subject=unsubscribe>
List-Archive: <https://ffmpeg.org/pipermail/ffmpeg-devel>
List-Post: <mailto:ffmpeg-devel@ffmpeg.org>
List-Help: <mailto:ffmpeg-devel-request@ffmpeg.org?subject=help>
List-Subscribe: <https://ffmpeg.org/mailman/listinfo/ffmpeg-devel>,
 <mailto:ffmpeg-devel-request@ffmpeg.org?subject=subscribe>
Reply-To: FFmpeg development discussions and patches <ffmpeg-devel@ffmpeg.org>
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Errors-To: ffmpeg-devel-bounces@ffmpeg.org
Sender: "ffmpeg-devel" <ffmpeg-devel-bounces@ffmpeg.org>
Archived-At: <https://master.gitmailbox.com/ffmpegdev/20220113015101.4-50-jamrial@gmail.com/>
List-Archive: <https://master.gitmailbox.com/ffmpegdev/>
List-Post: <mailto:ffmpegdev@gitmailbox.com>

From: Anton Khirnov <anton@khirnov.net>

Signed-off-by: James Almer <jamrial@gmail.com>
---
 libavformat/dtshddec.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/libavformat/dtshddec.c b/libavformat/dtshddec.c
index b84588af7c..a3b3b92055 100644
--- a/libavformat/dtshddec.c
+++ b/libavformat/dtshddec.c
@@ -104,7 +104,8 @@ static int dtshd_read_header(AVFormatContext *s)
             duration *= avio_rb16(pb); // samples_per_frames
             st->duration = duration;
             avio_skip(pb, 5);
-            st->codecpar->channels = ff_dca_count_chs_for_mask(avio_rb16(pb));
+            st->codecpar->ch_layout.order       = AV_CHANNEL_ORDER_UNSPEC;
+            st->codecpar->ch_layout.nb_channels = ff_dca_count_chs_for_mask(avio_rb16(pb));
             st->codecpar->initial_padding = avio_rb16(pb);
             avio_skip(pb, chunk_size - 21);
             break;
-- 
2.34.1

_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".