From patchwork Thu Jan 13 02:00:18 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 33446 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp35613iog; Wed, 12 Jan 2022 18:30:19 -0800 (PST) X-Google-Smtp-Source: ABdhPJzmJKjhwLR89NMC8wMdzbTnneiOZ0qhExxoPGnVbhr1oPJySSCnD3NOIszSx6ahEPVgDdy+ X-Received: by 2002:aa7:ccc7:: with SMTP id y7mr2278125edt.96.1642041018881; Wed, 12 Jan 2022 18:30:18 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1642041018; cv=none; d=google.com; s=arc-20160816; b=szuqjIVyCtxKXTrXFUngyWAgYXFXEnAMebdIA80JMmp1/KGUMklOJReHfirB34S32f UTYPq1R4t5a+onUvuzN0A+m/zTysEchIYNPrUCOePHHJ0H6e3y3Oa7dlg+PAoZtXHq4y LbeJ4JUumsbNOeT5fKJEQ6yr73A7OwL0eBv0ygsaJ+vpKS2T3+K4gqgPDWxlWLpnD8aY PEeNo5ztauCa8Vr4+SdAMKHzcVTVRDSIYjNHrDOulq0w8TeQSh7vfLgySEJZseV8MB6Z t9G24cJjB9uJaM+HgObZokkX8AWcFfXn0mxG87VtjNdbxKD+4pUwvX0KcRv6hKbROSgH d3lg== 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=mX/wOpACofikJgpFoDO8WwCp2/6gvMTNRbbVbIazg0E=; b=h/mtn4QYLvKOnuTbxROKXorvW4IIO1kFJqbTgvON4Mo0cnxsljVme+njx02Xgpv78G sqMz2kg1srv2Q/VHQnIF9qXX9j73qmVXJep5Ogk87qLSNcRr82nbRy5IgSY3cGRrw43x IXxxJlhOL2QT6goRDm5YrXY1Hv+GZNi4Q4BXYS8TUDuV8jfCtqgVIVoqYq64+BYUmIfN JxBXmHLK3ajHMYlwifjiM8+ut9ekQOe7dF7xijeMIrVPul1qRUnipXD2ouCpUWTQeEe+ y1WdWJKOePKyUZDqzo6gUZz5RFeSnQ+lGjM3kD6/aOzLIum7bxhdPVu9yI0F3qvv7sZI AgtQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=C3XZCMZu; 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 ks7si759955ejb.399.2022.01.12.18.30.18; Wed, 12 Jan 2022 18:30:18 -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=C3XZCMZu; 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 1184B68B52F; Thu, 13 Jan 2022 04:01:39 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qv1-f50.google.com (mail-qv1-f50.google.com [209.85.219.50]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E27AC68B505 for ; Thu, 13 Jan 2022 04:01:34 +0200 (EET) Received: by mail-qv1-f50.google.com with SMTP id iw1so5165334qvb.1 for ; Wed, 12 Jan 2022 18:01:34 -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=VxvKCkY3xqc8m3nG2KldgI+uBeFJL6yWFDZxLNKRvNY=; b=C3XZCMZuKapc3N+SLJ0ylK59yQhhtOZGMoQOIENyTEhcxlblSLQEDfPkgJTEZxDbsa ax3Il7WXqvd0x7fUWb2uC8Ly/PaI9e9MwNzXkD/CCssW4oa4nvFmpQp73vr7JhgQOiJN 9/BrorJSl8sI9JsvA7nP5Omh4C3bXsmK4FX3tXXudpu5pus0q4Jsmw7itzTNYxNHyywB 5fn1BvFP+HI90Xur7uqsxEuJrFPrqZS+6t7FDmuo+9TQJUawl6o4OAMaqxu9Dpjo/EXW H6LWZ3y9+/nc7Yb+Bu8cSXEFe0tyZ0T1OTv3V4rKVXDbqhxLnXlK13F6FUXEnnbnsMFn YPkA== 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=VxvKCkY3xqc8m3nG2KldgI+uBeFJL6yWFDZxLNKRvNY=; b=y7rYzTOGV7vhfI89ZGs/o2L0oMlDvE01vlaoRbExy5ApoME7IfGXclj/MqHAvMr+Fx D7dcKa7ESq1dptiu/Ko7mT4s7PyUDGcG/wgjQNoBP+fp9Gng8FjQjh+HamDYNbTRvZRU dpcUrvYg1CadZ+NTHPaHZOlSEOhvbuwrRiCe0xFW34IsE2hpRapnBhOLwLZFx/DwOP0+ d1xjuzQyFuTDau7hl9oCnCz7+iXOBaFYoxmMDvJZRHG8lLRZH6F4l49Ovl1dyo0ECHV1 /s8KB1Mknh3HTU71cph4+gdaNqHBVyNs8HsvDGnKuswGAY0S3PK8OAgPycU95pKw/fgd 4BYg== X-Gm-Message-State: AOAM530rNp7TMrqbTAlxMkWjJia5a12qezcV3Xq9KLFRYfY3invuFy/7 iFOSEmEu3Lob/byLhmKoe4LKO/nLfvU= X-Received: by 2002:a05:6214:e41:: with SMTP id o1mr1460726qvc.1.1642039293322; Wed, 12 Jan 2022 18:01:33 -0800 (PST) Received: from localhost.localdomain ([186.136.131.95]) by smtp.gmail.com with ESMTPSA id y17sm1182232qtj.75.2022.01.12.18.01.32 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 Jan 2022 18:01:33 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Wed, 12 Jan 2022 23:00:18 -0300 Message-Id: <20220113020026.590-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 171/281] wv: 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: NYdcAZrekWm1 From: Vittorio Giovara Signed-off-by: Vittorio Giovara Signed-off-by: James Almer --- libavformat/wvdec.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/libavformat/wvdec.c b/libavformat/wvdec.c index 0d5a86953d..61a683a85e 100644 --- a/libavformat/wvdec.c +++ b/libavformat/wvdec.c @@ -256,8 +256,7 @@ static int wv_read_header(AVFormatContext *s) AV_WL16(st->codecpar->extradata, wc->header.version); st->codecpar->codec_type = AVMEDIA_TYPE_AUDIO; st->codecpar->codec_id = AV_CODEC_ID_WAVPACK; - st->codecpar->channels = wc->chan; - st->codecpar->channel_layout = wc->chmask; + av_channel_layout_from_mask(&st->codecpar->ch_layout, wc->chmask); st->codecpar->sample_rate = wc->rate; st->codecpar->bits_per_coded_sample = wc->bpp; avpriv_set_pts_info(st, 64, 1, wc->rate);