]> 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>
Tue, 27 Mar 2012 21:32:58 +0000 (21:32 +0000)
committerronag <ronag@362d55ac-95cf-4e76-9f9a-cbaa9c17b72d>
Tue, 27 Mar 2012 21:32:58 +0000 (21:32 +0000)
core/consumer/output.cpp

index 3a0f7432faf18ba2cef09bf76af22e0e018ac4fc..1365a29df8e0c4ae0c1f78658ff722fcb5e00136 100644 (file)
@@ -163,10 +163,7 @@ public:
                                sync_timer_.tick(1.0/format_desc_.fps);\r
                                \r
                        if(input_frame.size() != format_desc_.size)\r
-                       {\r
-                               sync_timer_.tick(1.0/format_desc_.fps);\r
                                return;\r
-                       }\r
                                        \r
                        auto minmax = minmax_buffer_depth();\r
 \r
@@ -178,8 +175,8 @@ public:
 \r
                        for(auto it = ports_.begin(); it != ports_.end();)\r
                        {\r
-                               auto& port              = it->second;\r
-                               auto& frame             = frames_.at(port.buffer_depth()-minmax.first);\r
+                               auto& port      = it->second;\r
+                               auto& frame     = frames_.at(port.buffer_depth()-minmax.first);\r
                                        \r
                                try\r
                                {\r