[streaming_consumer] Started the process of retiring ffmpeg_consumer so that streamin...

[casparcg] / shell / casparcg.config

diff --git a/shell/casparcg.config b/shell/casparcg.config
index efc5c51c2c302ae2defe080eeaa051c19a0276eb..2d9826ffdbcf6fb672ecf51c53a812d26e06498e 100644 (file)
--- a/shell/casparcg.config
+++ b/shell/casparcg.config
@@ -37,21 +37,20 @@
 <!--\r
 <log-level>           info  [trace|debug|info|warning|error|fatal]</log-level>\r
 <log-categories>      communication  [calltrace|communication|calltrace,communication]</log-categories>\r
-<force-deinterlace>   true  [true|false]</force-deinterlacing>\r
+<force-deinterlace>   false  [true|false]</force-deinterlace>\r
 <channel-grid>        false [true|false]</channel-grid>\r
 <mixer>\r
     <blend-modes>          false [true|false]</blend-modes>\r
     <mipmapping_default_on>false [true|false]</mipmapping_default_on>\r
     <straight-alpha>       false [true|false]</straight-alpha>\r
 </mixer>\r
-<auto-transcode>      true  [true|false]</auto-transcode>\r
 <accelerator>auto [cpu|gpu|auto]</accelerator>\r
 <template-hosts>\r
     <template-host>\r
-        <video-mode/>\r
-        <filename/>\r
-        <width/>\r
-        <height/>\r
+        <video-mode />\r
+        <filename />\r
+        <width />\r
+        <height />\r
     </template-host>\r
 </template-hosts>\r
 <flash>\r
@@ -116,12 +115,17 @@
             <stream>\r
                 <path>udp://localhost:9250</path>\r
                 <args>-format mpegts -vcodec libx264 -crf 25 -tune zerolatency -preset ultrafast</args>\r
+                <separate-key>false [true|false]</separate-key>\r
             </stream>\r
+            <syncto>\r
+                <channel-id>1</channel-id>\r
+            </syncto>\r
         </consumers>\r
     </channel>\r
 </channels>\r
 <osc>\r
   <default-port>6250</default-port>\r
+  <disable-send-to-amcp-clients>false [true|false]</disable-send-to-amcp-clients>\r
   <predefined-clients>\r
     <predefined-client>\r
       <address>127.0.0.1</address>\r