Merge branch '2.1.0' of https://github.com/CasparCG/Server into 2.1.0

[casparcg] / shell / casparcg.config

diff --git a/shell/casparcg.config b/shell/casparcg.config
index c549e44aa130cf0ce449d7d9aa52bae7000e153b..a42f6bd11417573d4ed6dae034789f735a39d747 100644 (file)
--- a/shell/casparcg.config
+++ b/shell/casparcg.config
@@ -87,9 +87,12 @@
             </decklink>\r
             <bluefish>\r
                 <device>[1..]</device>\r
+                               <sdi-stream>blue_422_channela [blue_422_channela|blue_4224_channela|blue_422_channelb|blue_422_channelc|blue_4224_channelc|blue_422_channeld] </sdi-stream>\r
                 <embedded-audio>false [true|false]</embedded-audio>\r
                 <channel-layout>stereo [mono|stereo|matrix|film|smpte|ebu_r123_8a|ebu_r123_8b|8ch|16ch]</channel-layout>\r
                 <key-only>false [true|false]</key-only>\r
+                <hardware-keyer>disabled [enabled|disabled]</hardware-keyer>\r
+                <hardware-keyer-audio-source> videooutputchannel [videooutputchannel|sdivideoinput]</hardware-keyer-audio-source>\r
             </bluefish>\r
             <system-audio>\r
                 <channel-layout>stereo [mono|stereo|matrix]</channel-layout>\r