Merge pull request #506 from dimitry-ishenko-casparcg/fixes-flags

[casparcg] / shell / casparcg.config

diff --git a/shell/casparcg.config b/shell/casparcg.config
index 5c4b33db330df0db81adf45af5aad42c26e89e9d..c549e44aa130cf0ce449d7d9aa52bae7000e153b 100644 (file)
--- a/shell/casparcg.config
+++ b/shell/casparcg.config
@@ -41,7 +41,7 @@
 <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
+    <mipmapping-default-on>false [true|false]</mipmapping-default-on>\r
     <straight-alpha>       false [true|false]</straight-alpha>\r
 </mixer>\r
 <accelerator>auto [cpu|gpu|auto]</accelerator>\r
@@ -71,7 +71,7 @@
 </thumbnails>\r
 <channels>\r
     <channel>\r
-        <video-mode>PAL [PAL|NTSC|576p2500|720p2398|720p2400|720p2500|720p5000|720p2997|720p5994|720p3000|720p6000|1080p2398|1080p2400|1080i5000|1080i5994|1080i6000|1080p2500|1080p2997|1080p3000|1080p5000|1080p5994|1080p6000|1556p2398|1556p2400|1556p2500|dci1080p2398|dci1080p2400|dci1080p2500|2160p2398|2160p2400|2160p2500|2160p2997|2160p3000|dci2160p2398|dci2160p2400|dci2160p2500] </video-mode>\r
+        <video-mode>PAL [PAL|NTSC|576p2500|720p2398|720p2400|720p2500|720p5000|720p2997|720p5994|720p3000|720p6000|1080p2398|1080p2400|1080i5000|1080i5994|1080i6000|1080p2500|1080p2997|1080p3000|1080p5000|1080p5994|1080p6000|1556p2398|1556p2400|1556p2500|dci1080p2398|dci1080p2400|dci1080p2500|2160p2398|2160p2400|2160p2500|2160p2997|2160p3000|2160p5000|2160p5994|2160p6000|dci2160p2398|dci2160p2400|dci2160p2500] </video-mode>\r
         <straight-alpha-output>false [true|false]</straight-alpha-output>\r
         <channel-layout>stereo [mono|stereo|matrix|film|smpte|ebu_r123_8a|ebu_r123_8b|8ch|16ch]</channel-layout>\r
         <consumers>\r
@@ -107,20 +107,21 @@
                 <borderless>false [true|false]</borderless>\r
             </screen>\r
             <newtek-ivga></newtek-ivga>\r
-            <file>\r
-                <path></path>\r
-                <vcodec>libx264 [libx264|qtrle]</vcodec>\r
+            <ffmpeg>\r
+                <path>[file|url]</path>\r
+                <args>[most ffmpeg arguments related to filtering and output codecs]</args>\r
                 <separate-key>false [true|false]</separate-key>\r
-            </file>\r
-            <stream>\r
-                <path>udp://localhost:9250</path>\r
-                <args>-format mpegts -vcodec libx264 -crf 25 -tune zerolatency -preset ultrafast</args>\r
-            </stream>\r
+                <mono-streams>false [true|false]</mono-streams>\r
+            </ffmpeg>\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