summaryrefslogtreecommitdiff
path: root/libavdevice/dshow_crossbar.c
diff options
context:
space:
mode:
authorrogerdpack <rogerpack2005@gmail.com>2015-01-26 01:29:58 -0700
committerrogerdpack <rogerpack2005@gmail.com>2015-01-26 01:29:58 -0700
commit7c2e26270124fc81babcfc7b9d070bb8bd8ab6fa (patch)
treeff38fc866de8cf8a8ccea2172c2cf09ccd442c61 /libavdevice/dshow_crossbar.c
parentce1bbb08f127ecb724c2c62791cad70c30dd270b (diff)
dshow: crossbar dialog was frequently being displayed twice, split up option so it can be just once
Signed-off-by: rogerdpack <rogerpack2005@gmail.com>
Diffstat (limited to 'libavdevice/dshow_crossbar.c')
-rw-r--r--libavdevice/dshow_crossbar.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/libavdevice/dshow_crossbar.c b/libavdevice/dshow_crossbar.c
index e3012dfe17..c0739da318 100644
--- a/libavdevice/dshow_crossbar.c
+++ b/libavdevice/dshow_crossbar.c
@@ -158,7 +158,8 @@ dshow_try_setup_crossbar_options(ICaptureGraphBuilder2 *graph_builder2,
}
/* TODO some TV tuners apparently have multiple crossbars? */
- if (ctx->show_crossbar_connection_dialog) {
+ if (devtype == VideoDevice && ctx->show_video_crossbar_connection_dialog ||
+ devtype == AudioDevice && ctx->show_audio_crossbar_connection_dialog) {
hr = IAMCrossbar_QueryInterface(cross_bar, &IID_IBaseFilter, (void **) &cross_bar_base_filter);
if (hr != S_OK)
goto end;