From patchwork Mon Jun 7 23:04:09 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Diederick C. Niehorster" X-Patchwork-Id: 28137 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:b214:0:0:0:0:0 with SMTP id b20csp3887255iof; Mon, 7 Jun 2021 16:06:57 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw47z2SYp1tm6EbNV+aJKBjRMQsBSllaoLV8Ls9VayLBue8WPPArzlkzeBKPwhpMSnZVgbO X-Received: by 2002:a05:6402:42d2:: with SMTP id i18mr22303272edc.168.1623107217773; Mon, 07 Jun 2021 16:06:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1623107217; cv=none; d=google.com; s=arc-20160816; b=SqNqQjEcVj4v8ejLFqkP5VwPQ82nDocjXC4ZZmZ+VA8Gp/5QMXQwoOrwc0+qs6R64S mYaHPhOYACx58DEms1ZfUrUZKrFUwMBoMW46IZCtNFOWijvwz0TflaERV35RBuvb23D+ mDmb+H+j3+qqoc4Lg4DVMI0waS/FHFsHqRUwCiyX0FX7Hc52QQraVyVP/+kFrk/Zgc1K P6GRwh01hrQ6ZCORvD+evzci+MgX5Ka3a7rLGhZN76T/gpJzIoydHzUXelAs4+gearVT p7Qg+hfwoL88m+VaqftTj5QABE9mM0EqxB+Lo2MpbYKlsJwDFF+Nr0F8IwcdxAv3qJ3/ y37A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc: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=8wX6OCkzNsD5idQqNDrvwnxTSehTvOMC0a1JKvd78k0=; b=d5efbjRnLiTp9kGr/2tIseJuazR+rydhCszBD6F7VA6fPIHsOySYRfLpK8ylSgJ9tu qLt+NFng3jC/vOL1N58LFCKOF4kDtJJVGHmZBtSNxml0/B65uxyGX8MBpgMvGDwvW2xD c6xicDzYwi5zJ0cbVutfRAM/iiTZ9ZIXS+2eVLvRG/mmCyp3zAhbXpNGVTVUdT/Jky6r bljq9tc7HfW2fpkzhHUJ6OLcwB0h2jq8blSvQ7cSijYg6Hhs1KbtEgQ/tx7e6tfjYxOv SXw5gSEXdFKhuVJuSEs0zriGkMRKqVu8rqV9UkXf7Rr0R5ajjAxOP6W3M+fCb8oNfZ3z 4TZg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=qSxm1SQq; 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 m26si15076233edp.349.2021.06.07.16.06.57; Mon, 07 Jun 2021 16:06:57 -0700 (PDT) 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=20161025 header.b=qSxm1SQq; 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 EE64A687FC5; Tue, 8 Jun 2021 02:04:59 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lf1-f53.google.com (mail-lf1-f53.google.com [209.85.167.53]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E246D6818DB for ; Tue, 8 Jun 2021 02:04:55 +0300 (EEST) Received: by mail-lf1-f53.google.com with SMTP id i10so29004925lfj.2 for ; Mon, 07 Jun 2021 16:04:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=qXkAJYSghJDl64VFrJ3sXAtSXszoeD2B44GUe77vHBs=; b=qSxm1SQqKofvLMEx7bO9Oxr4jJCs2+Hsg74EtyQBORfK1xXUL2Rek2ZgWcPOSHULaJ RXkBR87kAN26690jEHMqh5svIvGlXx3l/sbjr9nGuWx4qY4BFM9AYyd9rTXQ7JaHdOTI 8f1oYTw9rQ+4rSi5AGouzqqmmQoTWqVijsUpHPG4yyME1L9PAVdwhm59tvN7dTh9Xyqh DI7pQMnbxf/d2+eH/65jZoF2rovK0gf6TekS7JuWyi5zvJPJaTM0dTTGm8AEPy6iPuKL JWfNYJPB/l5EFjwMyJt3XOyWnZPcHiiVGtLXZDm1BRBRS5DA8DUlf8a1P8O/8V0fuxdx HspA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=qXkAJYSghJDl64VFrJ3sXAtSXszoeD2B44GUe77vHBs=; b=YySGFgDZxJhmmp+G73nyXXAqw8qo/+2L9XZwS2z9VYOz5u2LA9Rb2KmLxRvG4ACAqX xeHS+EBCCXFb6JAuLbr0WxxNQ0eGYsmoi5ntjrv7Ct2YCRdByrqENjq3F1eU24DVAhqC 9Og/3w00M+hf6jWxzgA1//O0oZy1XVbTWw6TRhE0jlTz+17tSylYHgOfDtuprvQDC45d 1WNu4tS1AsMe3iRG2w57oNWRyQ1jSueAm2JilQgfsRAvYTuC/iP4h7pivQxvfnfqNdOM Pmrc9o3OAd8gaRUTGf+W5I6eArMkySo4Vh3xaMDfcOYgEb0KwAS+5f8UAwEWcpgYO1zd q+6Q== X-Gm-Message-State: AOAM532sEoWRokB01If59LIzKQlH8WDAbl2u17urgpfUA3e5WbqOEgkH uviomsuR/J4D9rSRu9QMHkGcpCpVJ55acA== X-Received: by 2002:a19:c347:: with SMTP id t68mr13089233lff.653.1623107094736; Mon, 07 Jun 2021 16:04:54 -0700 (PDT) Received: from localhost.localdomain (84-217-56-54.customers.ownit.se. [84.217.56.54]) by smtp.gmail.com with ESMTPSA id v9sm1999563ljv.131.2021.06.07.16.04.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Jun 2021 16:04:54 -0700 (PDT) From: Diederick Niehorster To: ffmpeg-devel@ffmpeg.org Date: Tue, 8 Jun 2021 01:04:09 +0200 Message-Id: <20210607230414.612-31-dcnieho@gmail.com> X-Mailer: git-send-email 2.28.0.windows.1 In-Reply-To: <20210607230414.612-1-dcnieho@gmail.com> References: <20210607230414.612-1-dcnieho@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 30/35] avdevice/dshow: cosmetics 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 Cc: Diederick Niehorster Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: KKxwQGl9B68t Signed-off-by: Diederick Niehorster --- libavdevice/dshow.c | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/libavdevice/dshow.c b/libavdevice/dshow.c index 082ae5f26c..c158a536d8 100644 --- a/libavdevice/dshow.c +++ b/libavdevice/dshow.c @@ -940,6 +940,7 @@ dshow_cycle_formats(AVFormatContext *avctx, enum dshowDeviceType devtype, AVOptionRange *new_range[3] = { NULL }; int nb_range = 0; struct dshow_format_info *fmt_info = NULL; + r = IAMStreamConfig_GetStreamCaps(config, i, &type, (void *) caps); if (r != S_OK) goto next; @@ -2399,15 +2400,15 @@ static const AVClass dshow_class = { }; const AVInputFormat ff_dshow_demuxer = { - .name = "dshow", - .long_name = NULL_IF_CONFIG_SMALL("DirectShow capture"), - .priv_data_size = sizeof(struct dshow_ctx), - .read_header = dshow_read_header, - .read_packet = dshow_read_packet, - .read_close = dshow_read_close, - .control_message = dshow_control_message, - .get_device_list= dshow_get_device_list, + .name = "dshow", + .long_name = NULL_IF_CONFIG_SMALL("DirectShow capture"), + .priv_data_size = sizeof(struct dshow_ctx), + .read_header = dshow_read_header, + .read_packet = dshow_read_packet, + .read_close = dshow_read_close, + .control_message = dshow_control_message, + .get_device_list = dshow_get_device_list, .create_device_capabilities = dshow_create_device_capabilities, - .flags = AVFMT_NOFILE | AVFMT_NOBINSEARCH | AVFMT_NOGENSEARCH | AVFMT_NO_BYTE_SEEK, - .priv_class = &dshow_class, + .flags = AVFMT_NOFILE | AVFMT_NOBINSEARCH | AVFMT_NOGENSEARCH | AVFMT_NO_BYTE_SEEK, + .priv_class = &dshow_class, };