Merged new video mode support from trunk

[casparcg] / shell / casparcg.config

diff --git a/shell/casparcg.config b/shell/casparcg.config
index 2d895b9525cfa9ed3125dea4c5a57b25e9f2055d..e031a2916de37f88e97bd2e5712136a9507cb8af 100644 (file)
--- a/shell/casparcg.config
+++ b/shell/casparcg.config
@@ -49,7 +49,7 @@
 </flash>\r
 <channels>\r
     <channel>\r
-        <video-mode> PAL [PAL|NTSC|1080i5000|576p2500|720p2500|720p5000|720p5994|720p6000|1080i5000|1080i5994|1080i6000|1080p2500|1080p2997|1080p3000|1080p5000] </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] </video-mode>\r
         <consumers>\r
             <decklink>\r
                 <device>[1..]</device>\r
@@ -72,7 +72,7 @@
                 <windowed>false [true|false]</windowed>\r
                 <key-only>false [true|false]</key-only>\r
                 <auto-deinterlace>true [true|false]</auto-deinterlace>\r
-                <vsync>fasle [true|false]</vsync>\r
+                <vsync>false [true|false]</vsync>\r
             </screen>\r
             <file>\r
                 <path></path>\r