2.1.0: Renamed "force-deinterlacing" with "force-deinterlace".

git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/branches/2.1.0@2779 362d55ac-95cf-4e76-9f9a-cbaa9c17b72d

diff --git a/modules/ffmpeg/producer/muxer/frame_muxer.cpp b/modules/ffmpeg/producer/muxer/frame_muxer.cpp
index 2e654b13e73027aedc6f23be53fc35212d699ed8..0e8305cb615432de43c9023cbdefaf08e11e639c 100644 (file)
--- a/modules/ffmpeg/producer/muxer/frame_muxer.cpp
+++ b/modules/ffmpeg/producer/muxer/frame_muxer.cpp
@@ -89,7 +89,7 @@ struct frame_muxer::impl : boost::noncopyable
                , audio_cadence_(format_desc_.audio_cadence)\r
                , frame_factory_(frame_factory)\r
                , filter_str_(filter_str)\r
-               , force_deinterlacing_(env::properties().get(L"configuration.force-deinterlacing", true))\r
+               , force_deinterlacing_(env::properties().get(L"configuration.force-deinterlace", true))\r
        {               \r
                // Note: Uses 1 step rotated cadence for 1001 modes (1602, 1602, 1601, 1602, 1601)\r
                // This cadence fills the audio mixer most optimally.\r

diff --git a/shell/casparcg.config b/shell/casparcg.config
index cb357a5037091513cd1a982a996ce8d77c04e365..76bbffeebdbb8c9ebe377b5fe7afd91b17b39f6d 100644 (file)
--- a/shell/casparcg.config
+++ b/shell/casparcg.config
@@ -13,7 +13,7 @@
   </flash>\r
   <channels>\r
     <channel>\r
-      <video-mode>PAL</video-mode>\r
+      <video-mode>NTSC</video-mode>\r
       <consumers>\r
         <screen>\r
           <device>1</device>\r
@@ -31,7 +31,7 @@
 \r
 <!--\r
 <log-level>           trace [trace|debug|info|warning|error]</log-level>\r
-<force-deinterlacing> true  [true|false]</force-deinterlacing>\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
 <auto-transcode>      true  [true|false]</auto-transcode>\r