From patchwork Thu Jan 13 01:55: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: 33370 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp24829iog; Wed, 12 Jan 2022 18:11:49 -0800 (PST) X-Google-Smtp-Source: ABdhPJwDOsyj0OTNi7wZWHv29gDUA4Wvc+uS3fUoaR0OpazkA+WMiIeCHXE8eagkjmPfIju5wLJa X-Received: by 2002:a17:907:8a04:: with SMTP id sc4mr1871017ejc.392.1642039909614; Wed, 12 Jan 2022 18:11:49 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1642039909; cv=none; d=google.com; s=arc-20160816; b=owwsyRYbxnsdtw4yBs8ROmhdtI9vfCb8Jv1tiYqPZAkVP7KaBBtLr0lDxNvHuU72v9 GB3TlOxyBjz44VGYWAEusnGXVOKPyT14ND0Bszbxgpsilh4BX75slhEzjt/0fqcu8Rjk 6lOKf4xJmkq+GJCIwnUvLOrnxg7Crk925GS1O7yTosIxJ49SWIqhxwfDZzCllmQk2sCC uXQ8SXqiryrbZOSeW/mGvy+03QCiKKcZUHCy6wPaV08Q5FzrUYQeEXjIDCxXombeVOTg RcDwj99vRkuWNKUFbIhB7Idlk8fP4GM47iaIlElJjo1FIhLEP6XbaB42r16c1xrMFcM5 XnSA== 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=XQuIo+bkS+AKfmiX3doT1CiShj6s31mIjeWX1GTfm1UDtJM2Ey+YpcpOGWw6zMaH4B X+YgXe3x2YfUND3PYFktDsdvRagyWT2FqQVFlaAZdUIKKy3sz6+SNRBRhXBbdSxJiSc3 MI2ATGH6sYqBWGEJeaaBg4EJDwV8LdoZDprSm3laqK12HTlNmhvxDkXaK0sg78wOFtx5 EssgS1vsAzJUmHpLsnom55VdZ4RPv5Hg+1qh0aySzk5NgYuj4TtTbM+jYo5x4Ul9J+OV 0wBxN9dBP3S1305PSd9jxnnCoBZpvcBHYi5r3/zhfW5OPDFh36i3AXnFaZyD6QvEjeE/ PHzg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=KHx7ePM4; 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 g3si947583ejt.101.2022.01.12.18.11.49; Wed, 12 Jan 2022 18:11:49 -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=KHx7ePM4; 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 00E4E68B1B9; Thu, 13 Jan 2022 03:56:32 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qv1-f43.google.com (mail-qv1-f43.google.com [209.85.219.43]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9C17B68B1B9 for ; Thu, 13 Jan 2022 03:56:26 +0200 (EET) Received: by mail-qv1-f43.google.com with SMTP id 15so5054154qvp.12 for ; Wed, 12 Jan 2022 17:56:26 -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=KHx7ePM46ChOMxuCZX2Z2n6Tx6J2nyZfwmgJUyv1xcxBU5tsu+sj3gnj5V8IZI1xF8 JgL/bv2MnO1LNpbgdq32Kf/D8mxKEXHqTc8CeMK/ABAr+8NdWWvbC0FiM/LD2qmGwXb0 BxUAtNPV9KBZdJfjj4+v3RiJGBhzAauglwI/Jms3yJ4guzF57IQpGZvo2rjQ/nAwJmBQ DqY9o6+XP6DYwZZAVa3nAVzgHXYcrUVKl+cFCnyyRusIXW3vnY97kgm8oSgQQqANtenQ mW6MvAE/Op83AL2k2ViP1m0JWCUgGVOMnbhwJukFCnmyVHLM9mP/ufbsToAVVDvRKC09 qm8Q== 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=Ifv/hsH1J9Y+5LWmPtxUJVr+/yMsl/9uPujTZte2FCCZrTG2bbALBV+ZlQYRLtzfIr pe3omcWAZRN33lRvCEra3ci4dFp2ahXYwygGAB5iPtHUY1fpupe48AzwQBBTINRgPvi4 0pfk80JyBm8BuElCTJxZ2n4MGbmAkCq+xfwaLRkplAivbOrU7o+R00NvrbYLSJQpXxSU cMLFZqsJ5hrKB58qLkIgvce0mfPiIMaF8deMEWjmAn4XD09zbciYgNP9kokD1lI/FYEo ZE8kQxGffs1/Io7ggKbEzkBsx1xyxN8+yGCjdU7bluMs8OY92v9iqmFDCzCFgE7CGcRa xMjw== X-Gm-Message-State: AOAM533PCNYeLxvbzC0f6pvQTkFTbd1L+dOYOiMow6XAjQVSrcFH5BOz 5Fvsye0jmFmMzOxbQpqKOY7vHLrjKDw= X-Received: by 2002:a05:6214:250f:: with SMTP id gf15mr2261770qvb.77.1642038985355; Wed, 12 Jan 2022 17:56:25 -0800 (PST) Received: from localhost.localdomain ([186.136.131.95]) by smtp.gmail.com with ESMTPSA id t11sm906506qkm.77.2022.01.12.17.56.24 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 Jan 2022 17:56:25 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Wed, 12 Jan 2022 22:55:42 -0300 Message-Id: <20220113015612.448-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: svrMF4p6jCQi 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);