2.1.0: -display_mode: Fixed bug in operator<<. -frame_muxer: Fixed mispelling.

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

diff --git a/modules/ffmpeg/producer/muxer/display_mode.h b/modules/ffmpeg/producer/muxer/display_mode.h
index 7d3eaa83e7420a49f4974f6c10d8613e7cc81666..99da41372e8286a7ed7e4d3731283b61c93e2516 100644 (file)
--- a/modules/ffmpeg/producer/muxer/display_mode.h
+++ b/modules/ffmpeg/producer/muxer/display_mode.h
@@ -45,19 +45,17 @@ std::basic_ostream< CharT, TraitsT >& operator<< (std::basic_ostream<CharT, Trai
 {      \r
        switch(value)\r
        {\r
-               case simple:                                            o << L"simple";\r
-               case duplicate:                                         o << L"duplicate";\r
-               case half:                                                      o << L"half";\r
-               case interlace:                                         o << L"interlace";\r
-               case deinterlace_bob:                           o << L"deinterlace_bob";\r
-               case deinterlace_bob_reinterlace:       o << L"deinterlace_bob_reinterlace";\r
-               case deinterlace:                                       o << L"deinterlace";\r
-               default:                                                        o << L"invalid";\r
+               case simple:                                            return o << L"simple";\r
+               case duplicate:                                         return o << L"duplicate";\r
+               case half:                                                      return o << L"half";\r
+               case interlace:                                         return o << L"interlace";\r
+               case deinterlace_bob:                           return o << L"deinterlace_bob";\r
+               case deinterlace_bob_reinterlace:       return o << L"deinterlace_bob_reinterlace";\r
+               case deinterlace:                                       return o << L"deinterlace";\r
+               default:                                                        return o << L"invalid";\r
        }\r
-       return o;\r
 }\r
 \r
-\r
 static display_mode get_display_mode(const core::field_mode in_mode, double in_fps, const core::field_mode out_mode, double out_fps)\r
 {              \r
        static const auto epsilon = 2.0;\r

diff --git a/modules/ffmpeg/producer/muxer/frame_muxer.cpp b/modules/ffmpeg/producer/muxer/frame_muxer.cpp
index ef01d6e51a1ac2790452adb7803ee0c337984e9d..487d796b1be3520b7b78a9e152deeb3ab980094e 100644 (file)
--- a/modules/ffmpeg/producer/muxer/frame_muxer.cpp
+++ b/modules/ffmpeg/producer/muxer/frame_muxer.cpp
@@ -327,7 +327,7 @@ struct frame_muxer::impl : boost::noncopyable
                           display_mode_ != display_mode::deinterlace_bob && \r
                           display_mode_ != display_mode::deinterlace_bob_reinterlace)                  \r
                        {       \r
-                               CASPAR_LOG(info) << L"[frame_muxer] Automatically started non bob-deinterlacing. Consider starting producer with bob-deinterlacing (FILTER DEINTERLACE_BOB) for smoothest playback.";\r
+                               CASPAR_LOG(info) << L"[frame_muxer] Automatically started non bob-deinterlacing. Consider starting producer with bob-deinterlacing (FILTER DEINTERLACE_BOB) for smoother playback.";\r
                                display_mode_ = display_mode::deinterlace;\r
                        }\r
 \r