From patchwork Thu Jan 13 01:49:38 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 33306 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp13887iog; Wed, 12 Jan 2022 17:55:13 -0800 (PST) X-Google-Smtp-Source: ABdhPJwxBn82hguZzQOMYbFUj9y0b4yyS7ImhT3skhwV7FEkWoNRmeAfc69a2rahhyFWuE0RNVYc X-Received: by 2002:a05:6402:5251:: with SMTP id t17mr2140393edd.397.1642038913198; Wed, 12 Jan 2022 17:55:13 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1642038913; cv=none; d=google.com; s=arc-20160816; b=kfOKh8R3HdV82ZCuMfSexOpi6ulb9fg1I/mGPBTcwsrZClAW1RaBJWvIbpNu8coSM9 uyAaTeweO18ccUgNcVsHBSVvnvaitb+C9MOIGqiEAySHOGsUzxWJ1qz3qWouRF4WtCxq 8Jy1QsHt9FcBjHzw/OHzsnmglkdAH5GZ/8bwRcTkea8Qzj0GLkhd2VYUSRGLFoGF9cla +tMHjXCmWGboU6AOok9CRWYTNc0w8KWyyG6kEWC7ZgbcloD3IpSJbA8neD4kJRbIkjl4 WK+yeAwxRMsvzbx4byu3FWEz0wHZUYYAY/r5rp06P9c2xwoMQj1GEZyVuyXd9ZCdqO9t vlgw== 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=XmtFxeSMApht7u2E/SgNmryTG7CM7KOYEivzP9ppJ3KCeBY9z5qcYQF4IDuBE1yK7p A5MV86ti8cg7YugKvDXcJWZ2uzoSOMy0VqJkZ/Beym2qb2Ax7l2UznpKVXhMAjQXH5oX MtEKBg9qbHOTKnNZpw/OYR3zb+IX+jfnkY1+b/DxIiHRayxEqcDOrwRxLnRJGZ/JJLZn LLaaXImsar5Z19Zy7a2kQaTubVTEqoDrj8PcUgl1ZbVxOmucolOkYI2YFNuk20YhcT/z wVSj0ydTPTXBG0nAOmLbG0tBxVEQwKpO42m2lJqkDZW1gNvAs9y/9yBKqTyRMKlDXaJF ufbA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=WuMu3wZu; 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 u21si721175ejm.758.2022.01.12.17.55.12; Wed, 12 Jan 2022 17:55:13 -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=WuMu3wZu; 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 3E25A68AFB7; Thu, 13 Jan 2022 03:52:23 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk1-f180.google.com (mail-qk1-f180.google.com [209.85.222.180]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D26AA68AF98 for ; Thu, 13 Jan 2022 03:52:20 +0200 (EET) Received: by mail-qk1-f180.google.com with SMTP id t24so5523651qkg.11 for ; Wed, 12 Jan 2022 17:52:20 -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=WuMu3wZuQeIom/9L49kEPDL7e8++mo5ArjbEwhcZg8sftUqRU3PH0/jx6X4gwAUB08 qWDXPamtDMG7kr3anKkPxPefzxnJ+MjMvIQgfE/kcSKTi2gzJBiEol0pVrA5Yrdvh10o GHP/VRI9vl6A2vaypV1Xv7VunzyS9UL9iKja5yqVfk+Qlbk4uUnxp8URSho2ezmYwIpZ PRzCfz9huppKVNtDn8RBHCIw8Gjlh8zGvD2KEKVXL0Tn+9Y7EFZGEL5Sym6v6FmnbDQy /d5o4HhEEzSsYVqcMH+mLePD6JhH7LCtvMbCwJRRAvnHGpo4HEvwti2NOho5OxpSicen O6nA== 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=vGBLTxtP1kZT5WeqLgvP9iKYfzCN47CZml6i/uPP6lS9pxhkVkhvo3ks2b+owJI6Re YqplK6KiIcpVFygm0rp7r/LuYDtYiKSuokxOa0r7fJ49rrLyppl/c7b0clL6JvVdRgpv ClCecs+G5Y/CjaAvhGMaHSp+vvFO7wTrjq/U+6z3LgzSr4U1zRyxPIuVUkRW6z6C34BM /fC54oq1Rm8xGHv8Jrko8x2XvuZNrrfIqZzR81AA9UyLWiU7XAVaulsPZN2ku3hwJYWy uKE9KX44RorHVDLhduerh2arn3laBQSCD0Tg+RDcXNvO0nLkeFs5oKpsDvRK0l4kNOuN yq+A== X-Gm-Message-State: AOAM533N2yMyaX7H18hIpGf8/gFhd2om2mEbxewazniz49LUkEnHwPzG zLnmgHuj71qE3WzxyOAnEBNjpkAoS28= X-Received: by 2002:a05:620a:1098:: with SMTP id g24mr1157321qkk.123.1642038739131; Wed, 12 Jan 2022 17:52:19 -0800 (PST) Received: from localhost.localdomain ([186.136.131.95]) by smtp.gmail.com with ESMTPSA id i21sm1204710qti.31.2022.01.12.17.52.16 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 Jan 2022 17:52:17 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Wed, 12 Jan 2022 22:49:38 -0300 Message-Id: <20220113015101.4-17-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 016/281] 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: E3c0i/5bd+TM 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)