]> git.sesse.net Git - casparcg/commitdiff
git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/branches...
authorronag <ronag@362d55ac-95cf-4e76-9f9a-cbaa9c17b72d>
Mon, 15 Aug 2011 08:58:37 +0000 (08:58 +0000)
committerronag <ronag@362d55ac-95cf-4e76-9f9a-cbaa9c17b72d>
Mon, 15 Aug 2011 08:58:37 +0000 (08:58 +0000)
modules/flash/producer/flash_producer.cpp

index f24d6ef2fb03b1de414963cdd799f8ad4bab6961..1521b50d3bb46328d23acfaa6f0bbc1eebaaf050 100644 (file)
@@ -336,9 +336,9 @@ public:
                        {\r
                                context_->param(param); \r
 \r
-                               //const auto& format_desc = frame_factory_->get_video_format_desc();\r
-                               //if(abs(context_->fps() - format_desc.fps) > 0.01 && abs(context_->fps()/2.0 - format_desc.fps) > 0.01)\r
-                               //      CASPAR_LOG(warning) << print() << " Invalid frame-rate: " << context_->fps() << L". Should be either " << format_desc.fps << L" or " << format_desc.fps*2.0 << L".";\r
+                               const auto& format_desc = frame_factory_->get_video_format_desc();\r
+                               if(abs(context_->fps() - format_desc.fps) > 2.0 && abs(context_->fps()/2.0 - format_desc.fps) > 2.0)\r
+                                       CASPAR_LOG(warning) << print() << " Invalid frame-rate: " << context_->fps() << L". Should be either " << format_desc.fps << L" or " << format_desc.fps*2.0 << L".";\r
                        }\r
                        catch(...)\r
                        {\r