From: Helge Norberg Date: Thu, 29 Sep 2016 19:31:02 +0000 (+0200) Subject: [ffmpeg] Fixed compilation problems in Linux X-Git-Tag: 2.1.0_Beta1~46^2 X-Git-Url: https://git.sesse.net/?p=casparcg;a=commitdiff_plain;h=61974506572c47b0650c4b5bfa65cd18621d5fec [ffmpeg] Fixed compilation problems in Linux --- diff --git a/modules/ffmpeg/producer/audio/audio_decoder.cpp b/modules/ffmpeg/producer/audio/audio_decoder.cpp index cd5b37792..fe69a59cf 100644 --- 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 bffae75ed..a77994896 100644 --- a/modules/ffmpeg/producer/ffmpeg_producer.cpp +++ b/modules/ffmpeg/producer/ffmpeg_producer.cpp @@ -281,12 +281,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(); @@ -306,7 +306,7 @@ public: { CASPAR_LOG(trace) << print() << L" adjusting to " << adjusted_seek; input_.seek(static_cast(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 1e081a17a..bc1730314 100644 --- 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 5bc546078..bb15ee47c 100644 --- 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(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 +}}