From patchwork Thu Jan 13 01:49:42 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 33310 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp14290iog; Wed, 12 Jan 2022 17:55:55 -0800 (PST) X-Google-Smtp-Source: ABdhPJzict+AhlDRAyqVdIuRE5CtvoZV3H4xz7IVrB4u1SA61kSkjD8/wnTF53zXNVaLJiWdsY2Q X-Received: by 2002:a05:6402:2804:: with SMTP id h4mr2132931ede.193.1642038955678; Wed, 12 Jan 2022 17:55:55 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1642038955; cv=none; d=google.com; s=arc-20160816; b=fb+Dbbwr4Gasz4UVNFDm2to4xC51EABNNXqIVMyrDReNL/5aJ3Hj7N4vyiCfwvjFzh 2UCMHp5mnclRAo96BzzocQeuX7StVd+WeCUeLFPExnuEZq/e5Pj8pvdo90GxDlnyW4F7 RGcYDUmb1PzROb/pGy44lqqIzYZxEi9r6ywSvhxHveRxVHRDBBKO7jxYxSU424jAmRSs Wd8mXvP2duSaj9gqJpoRQPcjk1gTXSXPEAKsk8NgGDbXzgxINaNDfn0o88yedIte8p3V sXDxws4mqrbEGrqbKfsGMWdSB6B2cRqA6h//XFn9dv5ysVteSzlcAw44VjhCpFSjWBcT +sXA== 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=UVWDemHFTAM2fJlrbNFImWLtKgO1x9CGthRQ2ky6Z90=; b=gLQ3y4tenmi3cQ2Y+CuAelTtflsbjfboO9nC76NiVXI/CCZXSQjp83O7EFLd+DBLWX eIfimrd5sRryTxH75WGeiHBlu/oebStEWYjbRcb83JjYb3LuPl3oE+c0NegZse24fiWO f1yF69V/NYcd7PzL16Ec72h98A1cku9WtiOuSrqObUi8nF6we5xaiMfFy4vAVrLtMnFK prna1HEhiwXjv7QHERbMFafEpp23uiCMO45LLXQYsDU6cgpQUmw/54GlWDFeJyEIEGyt TmxB26PuN2hLwvr1OOyumAq8+dA+h/gg0ErYRHfEVa2qm1A/xxWkQrEZGvCzOfWTrfeh kgFQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=eO42XGda; 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 n10si674133ejx.850.2022.01.12.17.55.55; Wed, 12 Jan 2022 17:55:55 -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=eO42XGda; 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 F17C668AFDC; Thu, 13 Jan 2022 03:52:27 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk1-f181.google.com (mail-qk1-f181.google.com [209.85.222.181]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9EEF368AFD0 for ; Thu, 13 Jan 2022 03:52:25 +0200 (EET) Received: by mail-qk1-f181.google.com with SMTP id z10so1200732qkf.7 for ; Wed, 12 Jan 2022 17:52:25 -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=8OikxSEejB8dOmmHl4ahpMyicDnXIGsT9+pjsJggERo=; b=eO42XGdau+i4JP9hr7eEz6y5Mt14PF1zoKjgSsT54gykLubeHWd/YUl2zTVUWPTPmc 57ugKCT+BsPTxrP8aShRhuf47+80BapHX0GBaS6u4pCTzBv85B1Z5YLAacW9gAJ3axGu bVMIQ7nLc5N5SZy2CYPq9Z0/2Ngcv4evJ/eLwNKUqt3b1DdsecO4Zgf8wzGEVtMXuUxw esEyeia2zX91JegKZ095AXpsMq/cUDqQujIBt/Ay11CHUslm5S9TiQhSc7X70JCSTRW+ 3uyWhmNqWAZdnRPXA5k3FyglQJUGcNVzsKcp5uwilI0Rb9oUXbupgW5lYBjIHBw3tEsu +olw== 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=8OikxSEejB8dOmmHl4ahpMyicDnXIGsT9+pjsJggERo=; b=exw3fUK4Le0aim9DJZkjiolJtz5ziFbODnkwn4HLRjo3SzHBI12Crw/TwtV4psbS6X XhrWsGPIDPuqGf6sRYZPqWbpjirvcmv2qx1yGEnMftbQ9lSMVgGq+F1Ce32nU8yP6vXp 7Eckdbt4zBpl7DkJtdsj54q32nPsTLR/RmrjjHG6ir7saqJ4mKJ3n/sjxm9+o8vIgKyK RHRpckGkPlkOyocLfmp0x5uyOMHRD2Z9ECvW86BIrgU0vpitSmDO89+uKt5rAOtDUMEi ewPp7GtDVeT6/uSC7N0jxpEr8cgYIflCtPVWAK3EkzT82AZbvTPZ5HSZx0xxR/JN+7iQ +5Ug== X-Gm-Message-State: AOAM531j66OCe4sldl+ur3opwPUuQ9sY5J+GON8WvAfL6OKN8IB2KXvr XXcV2J/Tnif1edHecRmoSuQmoxEmMG4= X-Received: by 2002:a37:6681:: with SMTP id a123mr1865073qkc.102.1642038743957; Wed, 12 Jan 2022 17:52:23 -0800 (PST) Received: from localhost.localdomain ([186.136.131.95]) by smtp.gmail.com with ESMTPSA id i21sm1204710qti.31.2022.01.12.17.52.23 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 Jan 2022 17:52:23 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Wed, 12 Jan 2022 22:49:42 -0300 Message-Id: <20220113015101.4-21-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 020/281] afc: 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: HMCzW10WnhiF From: Anton Khirnov Signed-off-by: James Almer --- libavformat/afc.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/libavformat/afc.c b/libavformat/afc.c index 102b74baeb..898c7d03eb 100644 --- a/libavformat/afc.c +++ b/libavformat/afc.c @@ -38,12 +38,11 @@ static int afc_read_header(AVFormatContext *s) return AVERROR(ENOMEM); st->codecpar->codec_type = AVMEDIA_TYPE_AUDIO; st->codecpar->codec_id = AV_CODEC_ID_ADPCM_AFC; - st->codecpar->channels = 2; - st->codecpar->channel_layout = AV_CH_LAYOUT_STEREO; + st->codecpar->ch_layout = (AVChannelLayout)AV_CHANNEL_LAYOUT_STEREO; if ((ret = ff_alloc_extradata(st->codecpar, 1)) < 0) return ret; - st->codecpar->extradata[0] = 8 * st->codecpar->channels; + st->codecpar->extradata[0] = 8 * st->codecpar->ch_layout.nb_channels; c->data_end = avio_rb32(s->pb) + 32LL; st->duration = avio_rb32(s->pb);