From patchwork Wed Dec 8 01:06:32 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 32148 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp7045814iog; Tue, 7 Dec 2021 17:10:35 -0800 (PST) X-Google-Smtp-Source: ABdhPJxTnk51IHHP4M3XyV+BG4ZW1DVNi1d/OqiSms5WswyDHM22El34x7DYWcb9DunYC2Wn1Xlq X-Received: by 2002:a17:907:1c9d:: with SMTP id nb29mr3747225ejc.74.1638925835333; Tue, 07 Dec 2021 17:10:35 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1638925835; cv=none; d=google.com; s=arc-20160816; b=COKZDFKLPy9H0M70yAyYzcbo/rt9t03WbUNdaAlSHP24Cc4BhnC7NLMBwM++nFey8L it7IpMHicxaGI1TMaaKBZN4L5qGCuVh/BAx3rS4Ur8P2j5nMF0/D7eWSi/VqodcEwyjg kDtskTrLIQWc16VN66auXW1Ez7UAMKbbHCQCGg8mw/dcGkC6EIWONRl7mxK3r8YnkULk DXVr2kQ7Tydh5E2Dg+D292SJRYo4zRAubUtMKhZpBzPyyiIDhZmLrwCCdGtKYoSBmhRA PNQZrVWryVCZLJ07gOPFY1YHEmYODVCSJfOSzkOXAZSEVxhcCWg5Up+n9L1LI3AjSEPt Qq+w== 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=8pW5ZSXesTTSxBgWeBdzNyEjEbO+WI15Bby+6sCBUj4=; b=QffYFfg9dPQb2SkVgBcCjkmBkHkXSgO42/bfy0d5FVXiHEN1l8TuWdC6oDvBuDZE+O 3xuZkFDxZIk2wLtfXJom6PfZJ2xvpH95Kb18msEqgSflM9KPZux1E55MdRvtJIsmSgxE 3PsOEEEA1E0x6hQKELMXS+fNHaNO8NcuXt8lp1djEge3ex9N8Bu4LXSfQowznQKblo1n 0dEz+rk3SnsU6W/d3fgtbe/2pxes3j85oUDi0KknUh4o2RAYxxx2rHClgYVIPZAV4Uod 588KeBhqzK/l6ttT36lPGbUl8zcEUd++uxBFhRKX5sSgeJdgyPO0YwczY31rM94RDFdh p1Ig== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=CLnI0dDM; 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 k26si2062997edk.310.2021.12.07.17.10.35; Tue, 07 Dec 2021 17:10:35 -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=CLnI0dDM; 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 2413D68AF10; Wed, 8 Dec 2021 03:07:52 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-vk1-f180.google.com (mail-vk1-f180.google.com [209.85.221.180]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 77911680CAB for ; Wed, 8 Dec 2021 03:07:49 +0200 (EET) Received: by mail-vk1-f180.google.com with SMTP id h1so618013vkh.0 for ; Tue, 07 Dec 2021 17:07:49 -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=vygrBIcdFt+Y416k/+pMYchm9gDZoh6w1Vdds5JvAnk=; b=CLnI0dDMu3hF/smirPkVCYnWciECMpFwjhuf5KqUWfgugZdML2RaOmc754xX0C+AAN hrvd+z7ZjJEV7xeFoL7ADdNKxDVXA1YDsgcqY/LVEyvCVg/aFem7Khd8gimcKxz+L80v LfqAHMyLfloy/VTPPBFbSTUZXSpzbM6Hr2gy3sw5p5l73dgnD0Ptgdi7JG0BeU3VrOPT uL9nWvZ5MarqNWnoUKhJre7LSWIz5Wj4MDClIIXZ55wPXhqvEAJ885xwkzglyqHKRz12 rjpK393lyxEKzgyHEB23UzfKHoMc0pvUa1r7RQl/ePgkm0b2HiR4JJouhOB/z/Yyn8M/ G5ig== 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=vygrBIcdFt+Y416k/+pMYchm9gDZoh6w1Vdds5JvAnk=; b=IW/dulGMVKPj+KHjQ2U/cpYwS820cJ8iK/vzh8xmtfPtXCXEVV/qx8YCDBwQgPSteb GdRxyHsYRRyQrYXAAkkfolc2WF+XFeSMHvXrtGesN2m/3lpPXZ4qmk06uvluIC1ucgGY kkZvglTtGAtwgdiq9YzpGpWCOAUz3PVOTtquEhHdRzyHOTD+3uk0RbAus3351HjyCETs nWT9HYBewWK6Co0wjQp7nsCGvKOfaMhvshnVR3x490Ouyr7jQToRbQbyygSPoz/ZkfpB +u5j7ONs94O/BqcjrT96jcSGZxOLuaHHjgME7BU6RQz9WgNnQbyn9PBQFDEdYL8cKzt6 C7Ug== X-Gm-Message-State: AOAM530DZekSe4ly3e94DgUwgpbJw6/DHfREswJNHC/vvXLYuZtiwYo6 UwFazNVmpQ/V44ezJeFt+9ow0J4GcGOujf1C X-Received: by 2002:ac5:cfca:: with SMTP id m10mr56457556vkf.29.1638925667769; Tue, 07 Dec 2021 17:07:47 -0800 (PST) Received: from localhost.localdomain ([181.170.250.138]) by smtp.gmail.com with ESMTPSA id b8sm949898vsl.19.2021.12.07.17.07.46 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Dec 2021 17:07:47 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Tue, 7 Dec 2021 22:06:32 -0300 Message-Id: <20211208010649.381-17-jamrial@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20211208010649.381-1-jamrial@gmail.com> References: <20211208010649.381-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 016/279] adp: 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: FyaWGXLY/07w From: Anton Khirnov Signed-off-by: James Almer --- libavformat/adp.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/libavformat/adp.c b/libavformat/adp.c index 6d5f9d274e..c9a5a04507 100644 --- a/libavformat/adp.c +++ b/libavformat/adp.c @@ -55,8 +55,7 @@ static int adp_read_header(AVFormatContext *s) st->codecpar->codec_type = AVMEDIA_TYPE_AUDIO; st->codecpar->codec_id = AV_CODEC_ID_ADPCM_DTK; - st->codecpar->channel_layout = AV_CH_LAYOUT_STEREO; - st->codecpar->channels = 2; + st->codecpar->ch_layout = (AVChannelLayout)AV_CHANNEL_LAYOUT_STEREO; st->codecpar->sample_rate = 48000; st->start_time = 0; if (s->pb->seekable & AVIO_SEEKABLE_NORMAL)