]> 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>
Fri, 3 Feb 2012 17:52:43 +0000 (17:52 +0000)
committerronag <ronag@362d55ac-95cf-4e76-9f9a-cbaa9c17b72d>
Fri, 3 Feb 2012 17:52:43 +0000 (17:52 +0000)
core/consumer/output.cpp

index 3c37ca3cf3bd700765bf9f16d604ca57ec67ae4d..69e69896842ac38eda189e42e72e3cd35f3fa40a 100644 (file)
@@ -176,7 +176,7 @@ public:
                                        \r
                                auto minmax = minmax_buffer_depth();\r
 \r
-                               frames_.set_capacity(minmax.second - minmax.first + 1);\r
+                               frames_.set_capacity(std::max(1, minmax.second - minmax.first) + 1); // std::max(1, x) since we want to guarantee some pipeline depth for asycnhronous mixer read-back.\r
                                frames_.push_back(input_frame);\r
 \r
                                if(!frames_.full())\r