* Merged mipmapping_defaul_on configuration property.

[casparcg] / shell / casparcg.config

diff --git a/shell/casparcg.config b/shell/casparcg.config
index 01dcf8df47ec027a326921b6ac74ee652a5fb5af..2e740acb9a8b6aa86b4467e0d24e34cd35a02268 100644 (file)
--- a/shell/casparcg.config
+++ b/shell/casparcg.config
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>\r
 <configuration>\r
   <paths>\r
-       <media-path>media/</media-path>\r
-       <log-path>log/</log-path>\r
-       <data-path>data/</data-path>\r
-       <template-path>templates/</template-path>\r
-       <thumbnails-path>thumbnails/</thumbnails-path>\r
-       <fonts-path>fonts/</fonts-path>\r
+    <media-path>media/</media-path>\r
+    <log-path>log/</log-path>\r
+    <data-path>data/</data-path>\r
+    <template-path>templates/</template-path>\r
+    <thumbnails-path>thumbnails/</thumbnails-path>\r
+    <fonts-path>fonts/</fonts-path>\r
   </paths>\r
   <flash>\r
     <buffer-depth>4</buffer-depth>\r
@@ -45,7 +45,10 @@
 <log-level>           trace [trace|debug|info|warning|error]</log-level>\r
 <force-deinterlace>   true  [true|false]</force-deinterlacing>\r
 <channel-grid>        false [true|false]</channel-grid>\r
-<blend-modes>         true  [true|false]</blend-modes>\r
+<mixer>\r
+    <blend-modes>          false [true|false]</blend-modes>\r
+    <mipmapping_default_on>false [true|false]</mipmapping_default_on>\r
+</mixer>\r
 <auto-transcode>      true  [true|false]</auto-transcode>\r
 <accelerator>auto [cpu|gpu|auto]</accelerator>\r
 <template-hosts>\r