From patchwork Thu Jan 13 01:57:36 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 33399 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp28723iog; Wed, 12 Jan 2022 18:18:00 -0800 (PST) X-Google-Smtp-Source: ABdhPJzL18uQkPg/nvc42auCF1pau8Dz63znKx01Bd7FuJ7bIWNkJHe0Lnbl0gQ3o2WhVcucqZyv X-Received: by 2002:a05:6402:1d50:: with SMTP id dz16mr2317102edb.348.1642040280184; Wed, 12 Jan 2022 18:18:00 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1642040280; cv=none; d=google.com; s=arc-20160816; b=jjDZlsASqZtCYmNgDpOqQItanuejYOFLtoWR8gSdwMTi7bxGHK5PBVvj7+cNY+br6U Xafhy9I8C1qnm/fp1ACX4fdn3i7N1H16IB6nt4Ido9Xa3vaxySWxJxv7F+XqLjiuSy9R 5Tj6ZHsvSSQW2I4sm21JXqAhcbMqi7TGX/tWvzSLGtEzhZQEMdESfjLx1mYELlujc6BB 20/WQCT80Wc9OPhLw+tAGsfFUEhD1GZWRfzPF2EUPFB6YrTIE+zK4oM3c4eCsojmqXau zfJwj3DOIb/Y0gzLTbug6QekbKapN92XDM2nCnOfUyrwobYBcU1vaPJfKBzHlxmSZzFa BFOQ== 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=RBw2D0xp6F3LjcmwBgSucOPQIdjvPHYjEJDEIf4Visk=; b=Ium4HBMQuwmocXihaCYanFC96Vecb3llkxa/oznZRBar2n1zW6fh+3fAUGVRlz87ST HSdjIVCFWM5t1VY1PohFvd9LhWxfAc929449WKsGphMl7UEhJEfjQ9hJ9VC+efBx7atr FHdEBm4MXKv8sfAfjGGVQeZATkMZ/DmDjN9tO50GQVmGkQnubweX0wXnXTi61S/Ld5L1 Im3Tau1g/G7LCZNRJxjfFQEyIAfQ7Imh1WsfcFN49ip+nd7eZrn/mZmKg7/Xz/OsS9Ox MCUODzpNEhlrItptFDcMwybpsEmsKjXrTljNXhxqzt7OZr1ig/Y0/9Qk+jYNJ3j17xRc BAxA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=DK0QiKJ3; 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 b26si835327edj.619.2022.01.12.18.17.59; Wed, 12 Jan 2022 18:18:00 -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=DK0QiKJ3; 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 B1E4B68B327; Thu, 13 Jan 2022 03:58:28 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qt1-f179.google.com (mail-qt1-f179.google.com [209.85.160.179]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id ADA7468AF8D for ; Thu, 13 Jan 2022 03:58:27 +0200 (EET) Received: by mail-qt1-f179.google.com with SMTP id q14so5313068qtx.10 for ; Wed, 12 Jan 2022 17:58:27 -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=zQ/ZTD8j/6xZRmd545RQ6atPkqxsG9mONd7mZewc/70=; b=DK0QiKJ3PH95LwbbsdgfVyUpbQ8HgBNyabLFmzbwKtK8L6fXvAAfU9LuPxz6bXHiY+ CD88oqyehkGbnqbdsI5Od5ylCDLhxtoug3XflXZwx3OPZ9NFly1Lk00DNm5UrZq4Qm3L omtr+iQI7OAUQQfnytlXrf04zes/iCdpV27WgbYtVEqOaG2gwM7NDQsHOBYDp7rE0hHZ Sp9sreuRldw5kzhpjkZvEDHh7bmczzpkHSpcPIeS+/zmOdM5LQlZ4gugyqOVM+31nGfh Sbyz4jkzxqKJzMOUaptJqCMkP22EGhgvCX5cX49Sk0sMrsghZBNeSZTBGMstCkokT36s D0cg== 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=zQ/ZTD8j/6xZRmd545RQ6atPkqxsG9mONd7mZewc/70=; b=MaUrtbDVI7/CmdXDiOmCRgYUA81vb1dotB7zVWzFVwVjsuH7vXKm39dt71fUkIU3HR pzHq/Q1eKBDr6xWOERz67Tgy6puRdHrISwRlXgp/wN2e9UGwtPIp0hoTOKzZNuB9Z2xX YFR1DDCnyCnNYSoXNE9eZsyvNWMhhqwzmYICGq3XsOIdlU47Bs7ZhMTg2DhpwWY16w5q ZgQ3kwVmzH+3NkC2zDxWOxMa3bI+9VPHVQSUuZvi2Yh4P0hL73pSOYXnYj3LsFNb8oB3 SpZ9BPyzlTgrEBUBK+calmXmUT6/KbrvFwRT7sziQbeWpLE6XY9Uj72MuOtTfzj9SqXu PrWQ== X-Gm-Message-State: AOAM533XTE2gGubNvozJeLj6Fe4Iq29NvtyVMVAYpYg1ULTsn8lDbnqa exZRKoDkY/YHO4kTO0xsQ/OLIIz9qJI= X-Received: by 2002:ac8:5d8b:: with SMTP id d11mr2029104qtx.60.1642039106072; Wed, 12 Jan 2022 17:58:26 -0800 (PST) Received: from localhost.localdomain ([186.136.131.95]) by smtp.gmail.com with ESMTPSA id u19sm893081qke.1.2022.01.12.17.58.25 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 Jan 2022 17:58:25 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Wed, 12 Jan 2022 22:57:36 -0300 Message-Id: <20220113015806.519-1-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 089/281] lvf: 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: p0Qy+sQ0g1Qq From: Anton Khirnov Signed-off-by: James Almer --- libavformat/lvfdec.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavformat/lvfdec.c b/libavformat/lvfdec.c index cd64fb9aee..d060b3b0aa 100644 --- a/libavformat/lvfdec.c +++ b/libavformat/lvfdec.c @@ -79,7 +79,8 @@ static int lvf_read_header(AVFormatContext *s) st->codecpar->codec_type = AVMEDIA_TYPE_AUDIO; st->codecpar->codec_tag = avio_rl16(s->pb); - st->codecpar->channels = avio_rl16(s->pb); + st->codecpar->ch_layout.order = AV_CHANNEL_ORDER_UNSPEC; + st->codecpar->ch_layout.nb_channels = avio_rl16(s->pb); st->codecpar->sample_rate = avio_rl16(s->pb); avio_skip(s->pb, 8); st->codecpar->bits_per_coded_sample = avio_r8(s->pb);