Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
 help / color / mirror / Atom feed
From: Diederick Niehorster <dcnieho@gmail.com>
To: ffmpeg-devel@ffmpeg.org
Cc: Diederick Niehorster <dcnieho@gmail.com>
Subject: [FFmpeg-devel] [PATCH v5 17/21] avdevice/dshow: cosmetics
Date: Wed, 30 Mar 2022 14:18:02 +0200
Message-ID: <20220330121806.822-18-dcnieho@gmail.com> (raw)
In-Reply-To: <20220330121806.822-1-dcnieho@gmail.com>

Signed-off-by: Diederick Niehorster <dcnieho@gmail.com>
---
 libavdevice/dshow.c | 26 ++++++++++++++------------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/libavdevice/dshow.c b/libavdevice/dshow.c
index 58476a0f40..3cae7d265e 100644
--- a/libavdevice/dshow.c
+++ b/libavdevice/dshow.c
@@ -933,6 +933,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;
@@ -1558,7 +1559,8 @@ dshow_open_device(AVFormatContext *avctx, ICreateDevEnum *devenum,
             goto error;
         }
     }
-        if (ctx->device_filter[otherDevType]) {
+
+    if (ctx->device_filter[otherDevType]) {
         // avoid adding add two instances of the same device to the graph, one for video, one for audio
         // a few devices don't support this (could also do this check earlier to avoid double crossbars, etc. but they seem OK)
         if (strcmp(device_filter_unique_name, ctx->device_unique_name[otherDevType]) == 0) {
@@ -2441,16 +2443,16 @@ 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,
-    .get_device_list= dshow_get_device_list,
-    .control_message= dshow_control_message,
+    .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,
+    .get_device_list            = dshow_get_device_list,
+    .control_message            = dshow_control_message,
     .create_device_capabilities = dshow_create_device_capabilities,
-    .free_device_capabilities = dshow_free_device_capabilities,
-    .flags          = AVFMT_NOFILE | AVFMT_NOBINSEARCH | AVFMT_NOGENSEARCH | AVFMT_NO_BYTE_SEEK,
-    .priv_class     = &dshow_class,
+    .free_device_capabilities   = dshow_free_device_capabilities,
+    .flags                      = AVFMT_NOFILE | AVFMT_NOBINSEARCH | AVFMT_NOGENSEARCH | AVFMT_NO_BYTE_SEEK,
+    .priv_class                 = &dshow_class,
 };
-- 
2.28.0.windows.1

_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".

  parent reply	other threads:[~2022-03-30 12:21 UTC|newest]

Thread overview: 26+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-03-30 12:17 [FFmpeg-devel] [PATCH v5 00/21] avdevice (mostly dshow) enhancements Diederick Niehorster
2022-03-30 12:17 ` [FFmpeg-devel] [PATCH v5 01/21] avdevice: lock to minor version of avformat Diederick Niehorster
2022-03-30 12:17 ` [FFmpeg-devel] [PATCH v5 02/21] avformat: add control_message function to AVInputFormat Diederick Niehorster
2022-03-30 12:17 ` [FFmpeg-devel] [PATCH v5 03/21] avdevice/dshow: implement control_message interface Diederick Niehorster
2022-03-30 12:17 ` [FFmpeg-devel] [PATCH v5 04/21] avdevice: add control message requesting to show config dialog Diederick Niehorster
2022-03-30 12:17 ` [FFmpeg-devel] [PATCH v5 05/21] avdevice/dshow: accept show config dialog control message Diederick Niehorster
2022-03-30 12:17 ` [FFmpeg-devel] [PATCH v5 06/21] avdevice/dshow: add config dialog command for crossbar and tv tuner Diederick Niehorster
2022-03-30 12:17 ` [FFmpeg-devel] [PATCH v5 07/21] avdevice/avdevice: Revert "Deprecate AVDevice Capabilities API" Diederick Niehorster
2022-05-10 17:24   ` Andreas Rheinhardt
2022-05-10 17:40     ` Hendrik Leppkes
2022-05-12  8:17     ` Diederick C. Niehorster
2022-03-30 12:17 ` [FFmpeg-devel] [PATCH v5 08/21] avdevice/avdevice: clean up avdevice_capabilities_create Diederick Niehorster
2022-03-30 12:17 ` [FFmpeg-devel] [PATCH v5 09/21] avdevice: capabilities API details no longer public Diederick Niehorster
2022-03-30 12:17 ` [FFmpeg-devel] [PATCH v5 10/21] avutil/opt: document AVOptionRange min_value > max_value Diederick Niehorster
2022-03-30 12:17 ` [FFmpeg-devel] [PATCH v5 11/21] avdevice: Add internal helpers for querying device capabilities Diederick Niehorster
2022-03-30 12:17 ` [FFmpeg-devel] [PATCH v5 12/21] avdevice: change device capabilities option type Diederick Niehorster
2022-03-30 12:17 ` [FFmpeg-devel] [PATCH v5 13/21] avdevice: improve capabilities' option API Diederick Niehorster
2022-03-30 12:17 ` [FFmpeg-devel] [PATCH v5 14/21] avdevice/dshow: move audio format helpers Diederick Niehorster
2022-03-30 12:18 ` [FFmpeg-devel] [PATCH v5 15/21] avdevice/dshow: when closing, set context fields back to zero Diederick Niehorster
2022-03-30 12:18 ` [FFmpeg-devel] [PATCH v5 16/21] avdevice/dshow: implement capabilities API Diederick Niehorster
2022-03-30 12:18 ` Diederick Niehorster [this message]
2022-03-30 12:18 ` [FFmpeg-devel] [PATCH v5 18/21] avformat: add avformat_alloc_input_context() Diederick Niehorster
2022-03-30 12:18 ` [FFmpeg-devel] [PATCH v5 19/21] doc/examples: adding device_get_capabilities example Diederick Niehorster
2022-03-30 12:18 ` [FFmpeg-devel] [PATCH v5 20/21] Makefile/examples: cosmetics Diederick Niehorster
2022-03-30 12:18 ` [FFmpeg-devel] [PATCH v5 21/21] avdevice/dshow: capabilities query also works on opened device Diederick Niehorster
2022-04-25 20:23 ` [FFmpeg-devel] [PATCH v5 00/21] avdevice (mostly dshow) enhancements Diederick C. Niehorster

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20220330121806.822-18-dcnieho@gmail.com \
    --to=dcnieho@gmail.com \
    --cc=ffmpeg-devel@ffmpeg.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

This inbox may be cloned and mirrored by anyone:

	git clone --mirror https://master.gitmailbox.com/ffmpegdev/0 ffmpegdev/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 ffmpegdev ffmpegdev/ https://master.gitmailbox.com/ffmpegdev \
		ffmpegdev@gitmailbox.com
	public-inbox-index ffmpegdev

Example config snippet for mirrors.


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git