From: HellGore <helge.norberg@gmail.com>
Date: Fri, 19 Aug 2016 13:58:06 +0000 (+0200)
Subject: Merge pull request #462 from pkeuter/patch-1
X-Git-Tag: 2.1.0_Beta1~65^2
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=f94590ebd2307d5777a999ee9088c7f68d5d6e61;hp=711fbd35f16d6d3affa84b784e7dfa7aa3dc0e5e;p=casparcg

Merge pull request #462 from pkeuter/patch-1

Fix CPU hogging on EOF in ffmpeg producer.
---

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();