diff options
author | gla <gla@witbe.net> | 2019-08-20 12:44:44 +0200 |
---|---|---|
committer | Tim-Philipp Müller <tim@centricular.com> | 2019-08-23 15:10:56 +0300 |
commit | 1298e6a18668b229384c61c347e920065507228d (patch) | |
tree | ccfefeb4d345c62eb66a6c7bd33c05339bbc2730 | |
parent | cd8bb641f81b7a7a0379aff9334b36a8eb9e638f (diff) | |
download | gstreamer-plugins-bad-1298e6a18668b229384c61c347e920065507228d.tar.gz |
dshowsrcwrapper: fix regression on device selection
Do not take device_name if a device has been specified. Do not take device_index into account if a device or a device name has been specified.
-rw-r--r-- | sys/dshowsrcwrapper/gstdshow.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/dshowsrcwrapper/gstdshow.cpp b/sys/dshowsrcwrapper/gstdshow.cpp index 24a241ada..2b41dcb08 100644 --- a/sys/dshowsrcwrapper/gstdshow.cpp +++ b/sys/dshowsrcwrapper/gstdshow.cpp @@ -443,10 +443,10 @@ gst_dshow_select_device (const GUID * device_category, if (device && g_strcmp0 (device, entry->device) == 0) { selected = entry; break; - } else if (device_name && g_strcmp0 (device_name, entry->device_name) == 0) { + } else if (!device && device_name && g_strcmp0 (device_name, entry->device_name) == 0) { selected = entry; break; - } else if (device_index == entry->device_index) { + } else if (!device && !deviceName && device_index == entry->device_index) { selected = entry; break; } |