Updated to ffmpeg version 2.2.3

[casparcg] / shell / casparcg.config

diff --git a/shell/casparcg.config b/shell/casparcg.config
index 06752f9254a41c5e92eb63c3abfde4eeaeb0a9b4..43308b7ca7e36bb4f09d6eb7f2952dd213fe7b36 100644 (file)
--- a/shell/casparcg.config
+++ b/shell/casparcg.config
@@ -5,14 +5,24 @@
     <log-path>log\</log-path>\r
     <data-path>data\</data-path>\r
     <template-path>templates\</template-path>\r
+    <thumbnails-path>thumbnails\</thumbnails-path>\r
   </paths>\r
   <flash>\r
     <buffer-depth>4</buffer-depth>\r
   </flash>\r
+  <thumbnails>\r
+    <generate-thumbnails>true</generate-thumbnails>\r
+    <width>256</width>\r
+    <height>144</height>\r
+    <video-grid>2</video-grid>\r
+    <scan-interval-millis>5000</scan-interval-millis>\r
+    <generate-delay-millis>2000</generate-delay-millis>\r
+    <video-mode>720p2500</video-mode>\r
+  </thumbnails>\r
   <lock-clear-phrase>secret</lock-clear-phrase>\r
   <channels>\r
     <channel>\r
-      <video-mode>576p2500</video-mode>\r
+      <video-mode>720p5000</video-mode>\r
       <consumers>\r
         <screen>\r
           <device>1</device>\r
@@ -50,7 +60,7 @@
 </flash>\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] </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|2k2398|2k2400|2k2500|4k2398|4k2400|4k2500|4k2997|4k3000] </video-mode>\r
         <consumers>\r
             <decklink>\r
                 <device>[1..]</device>\r
@@ -83,4 +93,13 @@
         </consumers>\r
     </channel>\r
 </channels>\r
+<osc>\r
+  <default-port>6250</default-port>\r
+  <predefined-clients>\r
+    <predefined-client>\r
+      <address>127.0.0.1</address>\r
+      <port>5253</port>\r
+    </predefined-client>\r
+  </predefined-clients>\r
+</osc>\r
 -->\r