]> git.sesse.net Git - casparcg/commitdiff
2.0. frame_muxer: Fallback to simple if display mode could not be detected.
authorronag <ronag@362d55ac-95cf-4e76-9f9a-cbaa9c17b72d>
Wed, 10 Aug 2011 13:36:18 +0000 (13:36 +0000)
committerronag <ronag@362d55ac-95cf-4e76-9f9a-cbaa9c17b72d>
Wed, 10 Aug 2011 13:36:18 +0000 (13:36 +0000)
git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/branches/2.0.0.2@1125 362d55ac-95cf-4e76-9f9a-cbaa9c17b72d

modules/ffmpeg/producer/frame_muxer.cpp

index ba3d0ae0d6e6298663ca24bca51c62af19cf6fae..860df1c1ba91a49a334390f23cf38cc88281765d 100644 (file)
@@ -187,7 +187,13 @@ struct frame_muxer::implementation : boost::noncopyable
                        else\r
                                display_mode_ = display_mode::simple;\r
 \r
-                       CASPAR_LOG(info) << "frame_muxer: " << display_mode::print(display_mode_);\r
+                       if(display_mode_ == display_mode::invalid)\r
+                       {\r
+                               CASPAR_LOG(warning) << L"[frame_muxer] Failed to detect display-mode.";\r
+                               display_mode_ = display_mode::simple;\r
+                       }\r
+\r
+                       CASPAR_LOG(info) << "[frame_muxer] " << display_mode::print(display_mode_);\r
                }\r
                                \r
                if(hints & core::frame_producer::ALPHA_HINT)\r