X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=decklink_util.cpp;h=4b701abed3799448d2d6755652190a1c57769b77;hb=6ffaabac0a523617b686f40c154a25cb548cc561;hp=d8081961e9880a2c35ab3216cb9794f6b5f8e5c5;hpb=a97845e4b6587a2f9acf6b605ff00618dc3cc1b5;p=nageru

diff --git a/decklink_util.cpp b/decklink_util.cpp
index d808196..4b701ab 100644
--- a/decklink_util.cpp
+++ b/decklink_util.cpp
@@ -4,6 +4,7 @@
 #include <assert.h>
 
 #include "decklink_util.h"
+#include "flags.h"
 
 using namespace bmusb;
 using namespace std;
@@ -72,15 +73,18 @@ BMDVideoConnection pick_default_video_connection(IDeckLink *card, BMDDeckLinkAtt
 		if (attribute_id == BMDDeckLinkVideoInputConnections) {
 			fprintf(stderr, "Card %u has no input connections\n", card_index);
 		} else {
-			fprintf(stderr, "Card %u has no outpu connectionss\n", card_index);
+			fprintf(stderr, "Card %u has no output connections\n", card_index);
 		}
 		exit(1);
 	}
 
-	if (connection_mask & bmdVideoConnectionHDMI) {
+	if ((connection_mask & bmdVideoConnectionHDMI) &&
+	    global_flags.default_hdmi_input) {
 		return bmdVideoConnectionHDMI;
 	} else if (connection_mask & bmdVideoConnectionSDI) {
 		return bmdVideoConnectionSDI;
+	} else if (connection_mask & bmdVideoConnectionHDMI) {
+		return bmdVideoConnectionHDMI;
 	} else {
 		// Fallback: Return lowest-set bit, whatever that might be.
 		return connection_mask & (-connection_mask);