Merge pull request #397 from dimitry-ishenko-casparcg/2.1.0-fixes

2.1.0 fixes for gcc 4.9

diff --git a/accelerator/ogl/util/buffer.cpp b/accelerator/ogl/util/buffer.cpp
index 22b93c004b894fcd717c1e754d6f701d3056f68e..a5a7ab1a5995d6b2ebd5837f52cd7870d020e89e 100644 (file)
--- a/accelerator/ogl/util/buffer.cpp
+++ b/accelerator/ogl/util/buffer.cpp
@@ -73,8 +73,8 @@ public:
                if(!pbo_)
                        CASPAR_THROW_EXCEPTION(caspar_exception() << msg_info("Failed to allocate buffer."));
 
-               (usage == usage::write_only ? g_w_total_count : g_r_total_count)        ++;
-               (usage == usage::write_only ? g_w_total_size : g_r_total_size)          += size_;
+               (usage == buffer::usage::write_only ? g_w_total_count : g_r_total_count)        ++;
+               (usage == buffer::usage::write_only ? g_w_total_size : g_r_total_size)          += size_;
                
                if(timer.elapsed() > 0.02)
                        CASPAR_LOG(warning) << L"[buffer] Performance warning. Buffer allocation blocked: " << timer.elapsed();

diff --git a/modules/ffmpeg/producer/input/input.cpp b/modules/ffmpeg/producer/input/input.cpp
index 64a75f6758cfa7ea19d2584742ec6f38e6d83b34..d196752ff3a16ac7914bd379855a72a374a0d4c1 100644 (file)
--- a/modules/ffmpeg/producer/input/input.cpp
+++ b/modules/ffmpeg/producer/input/input.cpp
@@ -193,7 +193,7 @@ struct input::impl : boost::noncopyable
                                        return false;
 
                                // Play nice
-                               boost::this_thread::sleep(boost::posix_time::milliseconds(5));
+                               boost::this_thread::sleep_for(boost::chrono::milliseconds(5));
                        }
 
                        return true;