From: Helge Norberg <helge.norberg@svt.se>
Date: Fri, 19 Aug 2016 13:58:17 +0000 (+0200)
Subject: Merge branch '2.1.0' of https://github.com/CasparCG/Server into 2.1.0
X-Git-Tag: 2.1.0_Beta1~65
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=e75624659ed539334f9c83a99404c20206df76e3;hp=ac181d6fde621f4b09bc6c98ee9115c17d8da526;p=casparcg

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

diff --git a/modules/ffmpeg/producer/input/input.cpp b/modules/ffmpeg/producer/input/input.cpp
index 9d4acbd23..13ca48d5e 100644
--- a/modules/ffmpeg/producer/input/input.cpp
+++ b/modules/ffmpeg/producer/input/input.cpp
@@ -385,7 +385,7 @@ private:
 				{
 					boost::unique_lock<boost::mutex> lock(mutex_);
 
-					while(full() && !seek_target_ && is_running_)
+					while((eof_ || full()) && !seek_target_ && is_running_)
 						cond_.wait(lock);
 					
 					tick();