From patchwork Thu Jan 13 01:50:13 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 33336 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp18635iog; Wed, 12 Jan 2022 18:02:53 -0800 (PST) X-Google-Smtp-Source: ABdhPJyt9J6YBnkuVmXdKCsD9ZCkW+FfVLjIh6sIFNTKVGmVUZHvesEePpg3ONIB52NUkYMSCybA X-Received: by 2002:a05:6402:1e91:: with SMTP id f17mr761955edf.229.1642039372907; Wed, 12 Jan 2022 18:02:52 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1642039372; cv=none; d=google.com; s=arc-20160816; b=GUqH9y4jp8cMBEUJoGFmpmoQocjXqYraBnTDeXOihUx02FQfzfCpKTUnyc44D7xlbH NkpC4rukm4l3GI1FDHEwTkGyCOH191xE7RLIkEFpG7vzvqEI/mdz7tSrhMShLCgfQzxu qrS6iWlRIblEv2iEtuDwO8lICCzVor87hTs9rdPGD6FNatYi1m/OvmtFWsdkXUjkPHJ5 bEf/Dhs/6t1yPmbh4SCg9e2NVVM5BRhWmqqNGi+MZi09qP39//+AGXQIU1g6ZAaAFjmm JN5U+FaYZJ/YySdAEr5NzSBvwDNyvrBjhHdynHC7jSPBKOZbJAZ00S6EGk0dUxpmuF/5 4WdQ== 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=s9x+1SNippPLaxFCrmuzWK0GAu9LIeDE/ZRIVMjZwso=; b=jivlxgXRc4l543WFW5lb45vTb0/kdC4Qv5TkYdGO5jIakwkL5AoI/YZvperJO0Au3U D6nAB5s2y51POEHr2JTS6JSOnzV9Q/mkrzMsNWegcquwQR/CNO6RPtE0StF3QAyelp3o N6zf1jmY1x36/zzwF4tXG7Xh4cCPcIeQ1SV4jhlmra30dXCNyHCq33iek3SyIRIVTD/D dn4StzFJy6diCpx6I8bcOXAnG5DagUkltR5RXDGuDqozMW5KkTPJTvmMd/wM33g+APgP fAC3R8hJrnk0p+Tcj/jhymY0ZwccjZMdaZ3DFzvxR8cCXUyOmjpNwteU4hkjmGqZspG3 NQsA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b="UiVK/qOS"; 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 c13si960879ede.207.2022.01.12.18.02.52; Wed, 12 Jan 2022 18:02:52 -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="UiVK/qOS"; 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 C11F368B0DE; Thu, 13 Jan 2022 03:53:06 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qv1-f53.google.com (mail-qv1-f53.google.com [209.85.219.53]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E01F068B0D0 for ; Thu, 13 Jan 2022 03:53:02 +0200 (EET) Received: by mail-qv1-f53.google.com with SMTP id hu2so5077104qvb.8 for ; Wed, 12 Jan 2022 17:53:02 -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=uSyHSQYuR1ZC315rqoBCcOVe0eeTkx/NxQTujpL6ssY=; b=UiVK/qOSCAGUsvSwc+TGmBG2ViVQ1Pkt/PiZIBDrYt/hcJEfyHnLFBOuBpBs4/MlWt PxC2fw6gPgBP6r4lRV+vsv3dC+/3/QCV7rrSzAUWxKRNAWWQ+ORxTFj4Gjtt6I7E/QqH rgLhkaFJWe2eA+OVM2k6uGL/o+jl0BK8lWh0UYmmCxjEQ7h/lhwbgxbvBIzN6us5uOYQ uAhnqwkY1n1yVcfjjix13kJxjmIlGSoj5mvaa0b25gOFzFiPTCgo3nib5Pi+G7OVxy2o 4uRS30sdTYwOtS1+nxalZcXMFOTcTtQdGyK7GqYAwf3b8O5oOrRHcjrq6f0tDh6QvnQl FPNg== 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=uSyHSQYuR1ZC315rqoBCcOVe0eeTkx/NxQTujpL6ssY=; b=rl6Wlbs/1L+h22DBxuU6QfpzmjlNUnt3jsQOQ8rQO/RcM0J2VeAn9Gq6MHrmLtkOBe RpDKmL8JV4z53cRmLoRHITz3B6MY9TuGTkdPiAWVwxeWAmSVAEJnBXesoJqzRPUX8EJ1 6djLrJCrH6bqbH9iGYRT1DHmia7te0M/nWqLbLgnMGqieXRh9Fsb4q7EbDQA/lvJB/ev UD7+xb1knmY6lu9RjwjXWgU6yIqHssn2Mlr6gHwnBdM0SsjjNZ2vL7RQD/mqlR71dqxm aMksI4uSeatqYpNqFvl4qkgsgbP/u5i00DhuGAbVQuk0rjk7xZijJuMZGXM83hz7xAm0 kWZA== X-Gm-Message-State: AOAM533W6zH+e0nI50uYMeypC9gPDmWDMH5ofQLO63B1pk+yBn20gKy/ xEJPL8XqBuLNsUC20ojj3b2siNBukTI= X-Received: by 2002:a05:6214:2349:: with SMTP id hu9mr2128161qvb.93.1642038781519; Wed, 12 Jan 2022 17:53:01 -0800 (PST) Received: from localhost.localdomain ([186.136.131.95]) by smtp.gmail.com with ESMTPSA id i21sm1204710qti.31.2022.01.12.17.53.00 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 Jan 2022 17:53:01 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Wed, 12 Jan 2022 22:50:13 -0300 Message-Id: <20220113015101.4-52-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 051/281] dshow: 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: IKlXlmBgIKMb Signed-off-by: James Almer --- libavdevice/dshow.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavdevice/dshow.c b/libavdevice/dshow.c index 3a16f3720f..c0a060dc0c 100644 --- a/libavdevice/dshow.c +++ b/libavdevice/dshow.c @@ -1632,7 +1632,8 @@ dshow_add_device(AVFormatContext *avctx, par->format = sample_fmt_bits_per_sample(fmt_info->sample_size); par->codec_id = waveform_codec_id(par->format); par->sample_rate = fmt_info->sample_rate; - par->channels = fmt_info->channels; + par->ch_layout.order = AV_CHANNEL_ORDER_UNSPEC; + par->ch_layout.nb_channels = fmt_info->channels; } avpriv_set_pts_info(st, 64, 1, 10000000);