Merge branch '2.1.0' of https://github.com/CasparCG/Server into 2.1.0

diff --git a/modules/ffmpeg/producer/audio/audio_decoder.cpp b/modules/ffmpeg/producer/audio/audio_decoder.cpp
index 6ed608a88d1fea57468ffc4f95908416331cbb49..ac7b44e423e91f2913bbd6c20bf4389349d1aab5 100644 (file)
--- a/modules/ffmpeg/producer/audio/audio_decoder.cpp
+++ b/modules/ffmpeg/producer/audio/audio_decoder.cpp
@@ -19,7 +19,7 @@
 * Author: Robert Nagy, ronag89@gmail.com
 */
 
-#include "../../stdafx.h"
+#include "../../StdAfx.h"
 
 #include "audio_decoder.h"
 

diff --git a/modules/ffmpeg/producer/ffmpeg_producer.cpp b/modules/ffmpeg/producer/ffmpeg_producer.cpp
index 5f2b995eba61bd22458c23f0e634ada24cd43016..4a4ca8a1b0c9c81ebefcc067cab09675317cef4d 100644 (file)
--- a/modules/ffmpeg/producer/ffmpeg_producer.cpp
+++ b/modules/ffmpeg/producer/ffmpeg_producer.cpp
@@ -282,12 +282,12 @@ public:
                                           // therefore no seeking should be necessary for the first frame.
                {
                        input_.seek(file_position > 1 ? file_position - 2: file_position).get();
-                       boost::this_thread::sleep(boost::posix_time::milliseconds(40));
+            boost::this_thread::sleep_for(boost::chrono::milliseconds(40));
                }
 
                for (int i = 0; i < NUM_RETRIES; ++i)
                {
-                       boost::this_thread::sleep(boost::posix_time::milliseconds(40));
+            boost::this_thread::sleep_for(boost::chrono::milliseconds(40));
 
                        auto frame = render_frame();
 
@@ -307,7 +307,7 @@ public:
                                {
                                        CASPAR_LOG(trace) << print() << L" adjusting to " << adjusted_seek;
                                        input_.seek(static_cast<uint32_t>(adjusted_seek) - 1).get();
-                                       boost::this_thread::sleep(boost::posix_time::milliseconds(40));
+                    boost::this_thread::sleep_for(boost::chrono::milliseconds(40));
                                }
                                else
                                        return frame.first;

diff --git a/modules/ffmpeg/producer/input/input.cpp b/modules/ffmpeg/producer/input/input.cpp
index 9103c7b261e8370ad14bfb60aa53118215d269de..72648037d8d9704374ebaacf0e3ee89d3dc3394e 100644 (file)
--- a/modules/ffmpeg/producer/input/input.cpp
+++ b/modules/ffmpeg/producer/input/input.cpp
@@ -19,7 +19,7 @@
 * Author: Robert Nagy, ronag89@gmail.com
 */
 
-#include "../../stdafx.h"
+#include "../../StdAfx.h"
 
 #include "input.h"
 

diff --git a/modules/ffmpeg/producer/video/video_decoder.cpp b/modules/ffmpeg/producer/video/video_decoder.cpp
index c8a1fc8609699ae69b7ab858ff05f44f06d3d591..cc21e88e4cfc10288d43c8453af7683461905527 100644 (file)
--- a/modules/ffmpeg/producer/video/video_decoder.cpp
+++ b/modules/ffmpeg/producer/video/video_decoder.cpp
@@ -19,7 +19,7 @@
 * Author: Robert Nagy, ronag89@gmail.com
 */
 
-#include "../../stdafx.h"
+#include "../../StdAfx.h"
 
 #include "video_decoder.h"
 
@@ -167,4 +167,4 @@ uint32_t video_decoder::file_frame_number() const{return static_cast<uint32_t>(i
 bool   video_decoder::is_progressive() const{return impl_->is_progressive_;}
 std::wstring video_decoder::print() const{return impl_->print();}
 
-}}
\ No newline at end of file
+}}