2.0.0.2: Updated to ffmpeg 0.8.

[casparcg] / shell / casparcg.config

diff --git a/shell/casparcg.config b/shell/casparcg.config
index 010549e19d021a34a95a31a0e1a1bd0bb33d1d0e..15708d4f229683e4d804588da9b184800d0a0dd2 100644 (file)
--- a/shell/casparcg.config
+++ b/shell/casparcg.config
@@ -1,23 +1,35 @@
 <?xml version="1.0" encoding="utf-8"?>\r
 <configuration>\r
   <paths>\r
-    <media-path>L:\\Casparcg\\_media\\</media-path>\r
-    <log-path>L:\\Casparcg\\_log\\</log-path>\r
-    <data-path>L:\\Casparcg\\_data\\</data-path>\r
-    <template-path>L:\\Casparcg\\_templates\\</template-path>\r
+    <media-path>L:\\casparcg\\_media\\</media-path>\r
+    <log-path>L:\\casparcg\\_log\\</log-path>\r
+    <data-path>L:\\casparcg\\_data\\</data-path>\r
+    <template-path>L:\\casparcg\\_templates\\</template-path>\r
     <template-host>cg.fth.18</template-host>\r
   </paths>\r
   <diagnostics>\r
     <graphs>true</graphs>\r
   </diagnostics>\r
+  <ffmpeg>\r
+    <auto-mode>false</auto-mode>\r
+  </ffmpeg>\r
   <channels>\r
     <channel>\r
-      <video-mode>PAL</video-mode>\r
+      <video-mode>1080i5000</video-mode>\r
       <consumers>\r
-        <bluefish>\r
-          <embedded-audio>false</embedded-audio>\r
-          <device>1</device>                      \r
-        </bluefish>\r
+        <decklink>\r
+          <device>1</device>\r
+          <embedded-audio>true</embedded-audio>\r
+        </decklink>\r
+      </consumers>\r
+    </channel>\r
+    <channel>\r
+      <video-mode>1080i5000</video-mode>\r
+      <consumers>\r
+        <decklink>\r
+          <device>2</device>\r
+          <embedded-audio>true</embedded-audio>\r
+        </decklink>\r
       </consumers>\r
     </channel>\r
 </channels>\r
@@ -30,6 +42,7 @@
 </configuration>\r
 \r
 <!--\r
+<auto-mode-convert>true [true|false]]</auto-mode-convert>\r
 <channel>\r
   <video-mode> PAL [PAL|NTSC|1080i5000|576p2500720p2500|720p5000|720p5994|720p6000|1080p2398|1080p2400|1080i5000|1080i5994|1080i6000|1080p2500|1080p2997|1080p3000|1080p5000] </video-mode>\r
     <consumers>\r