From patchwork Thu Jan 13 01:59:56 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 33430 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp33287iog; Wed, 12 Jan 2022 18:25:56 -0800 (PST) X-Google-Smtp-Source: ABdhPJy2wKW3CedjwA6WTWiINkn0jk70xVbColXI6jpwObOCif9fOPmEYzYmmj6haghg5lHHstle X-Received: by 2002:a17:906:1744:: with SMTP id d4mr1952806eje.569.1642040756058; Wed, 12 Jan 2022 18:25:56 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1642040756; cv=none; d=google.com; s=arc-20160816; b=eZbeNUxXoePpIlSAjksFiBSVJGS0cnXoN98O0/Z2jZuyiCZlG0S7pIJrv3pVrJvCuW PFwwg3Ak2Qopn7X/Zt0RgKRLi+/lVLzMap2FHvT8xfrG5WNNe3sdoqxPAGnB228thjra KrX31N1YVmp9HJiWK9gURw7bjBhx/EAqNkLdX9thoSQvPcSS42PMwd+4jznnd4m3zSIq 9y+jWPAGBHmdxQP55NT9CpfsMns2CSylt7uehiyrtLNcnXLBqfnay53Vlv9bZyNHmIYY sftWTpPFByZfphL8su6qeabtVYols3bkBpz4UymJxvvbbIj2QzNxOsLzu9c25f2cwgg7 XU5Q== 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=csrZ2+6FbgXlq0wKZMu10WW6OG2TA7Gb6gwQhbPewq6koXCVLNS1omqoWGiTKtaWPp IquNkixWZvR5IF4akCFmy7PWyvqev2Nm4xtKinkHff0pdpMOGOQQmK7CP8trzR4kwxze RC8Uok2W5RVQ5HVGttKJpkjBRtsL5tBbK8/pnEbKvBsrOs7WjvZ2OANPd1ALOBLKIwq1 0b/kJn92+H3TGplFGG7g/ENyVG6yBO/9Pk4wShoTbJI+zSzS28hu7BjDKeRbEC/B4pzD tKfmnyAKqIwFCq37IToZlZg1YbWBORiIaD8DW7BsX23Dq+FoXvY7rR6NLwRasubcfYkG MjmQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=JLGC2Ilw; 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 b12si1169316edz.42.2022.01.12.18.25.55; Wed, 12 Jan 2022 18:25:56 -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=JLGC2Ilw; 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 559A168B46B; Thu, 13 Jan 2022 04:01:13 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qv1-f54.google.com (mail-qv1-f54.google.com [209.85.219.54]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2B03668B43E for ; Thu, 13 Jan 2022 04:01:05 +0200 (EET) Received: by mail-qv1-f54.google.com with SMTP id q3so5126830qvc.7 for ; Wed, 12 Jan 2022 18:01:05 -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=JLGC2IlwiyDAbWu8YTLnqCt6xDCrx5CEGZaADTle0bTLKkmCka259dG7W+D96QuO5g BjD2OH9b4Gy1OWby5tycT9Hpt2uAlbK6R+aKxEE/Ch+65RtdmQlsiN0Di/fmjtGsC/p7 WK2zzK6PmOpGX3ufFIzVtjjsB9YolOremj/KGF5jwh4h67jqDPI4WAgoPRHajy/eC0rD 7N4mBksKQJQfYEFCCDoK1SJbW/WxMTw3/T/lWPnamVsmJUrnpLuQTYjYpvfrvuR3lZGq 7tRgE1PmtM+wHQm6jvfWtwdkfSDfIHIrO91dInlUMSUAAqSIZnt+yIBHGmP7bC2YqHbf +oeQ== 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=Rvh638tA+IGrZd7Nw46QDlx48/5XYHtAP3Bfjich+pf18eM5KDw6l1FCrLnZ9h1Ktw 6ftrxBNwYPHWCLsqsaczYVwmtuiyWIchJ4kXpUL5zGQYjd+5+UXD9RdPtxzZixx3p+EV Pjq32DST7g3c09H15JFRt+euzadMl1d3JQ1TPXYqr8yyzMV1M1DtwV8h9KfRZzc2MAOI L6Nt+9jcm0bJD12SYDkAyhw3sC5+133aKlldwe8d8FmZrYGfQPHu/Y0LxhRXLYWPO9SN HUkEIvdYywbyYuv5UL/oH8yhvT1q4oR739m//fY/jMSVugrLojCbMe+7NSPoJUSwWU0Q HaaA== X-Gm-Message-State: AOAM531Gq25jQn9HjsxoggkdpmAqjwfwisKJcLHQf/r5tNClMynCxYvn nNTU95qwy1/0aOLNcPAhG02YJLS0Xmg= X-Received: by 2002:a05:6214:19ec:: with SMTP id q12mr876557qvc.2.1642039263695; Wed, 12 Jan 2022 18:01:03 -0800 (PST) Received: from localhost.localdomain ([186.136.131.95]) by smtp.gmail.com with ESMTPSA id y17sm1182232qtj.75.2022.01.12.18.01.02 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 Jan 2022 18:01:03 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Wed, 12 Jan 2022 22:59:56 -0300 Message-Id: <20220113020026.590-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: gYcvCH6WCZX5 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);