From: Peter Keuter Date: Sat, 6 Aug 2016 19:00:56 +0000 (+0200) Subject: Fix CPU hogging on EOF in ffmpeg producer. X-Git-Tag: 2.1.0_Beta1~65^2^2 X-Git-Url: https://git.sesse.net/?p=casparcg;a=commitdiff_plain;h=dd695abcd8b29c620842f8e463c13008a0ef9deb Fix CPU hogging on EOF in ffmpeg producer. This PR fixes the CPU-usage going up when a file has finished playing in the 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 lock(mutex_); - while(full() && !seek_target_ && is_running_) + while((eof_ || full()) && !seek_target_ && is_running_) cond_.wait(lock); tick();