2.0.0.2: ffmpeg_producer: Fixed incorrect eof detection logic.

git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/branches/2.0.0.2@742 362d55ac-95cf-4e76-9f9a-cbaa9c17b72d

diff --git a/modules/ffmpeg/producer/ffmpeg_producer.cpp b/modules/ffmpeg/producer/ffmpeg_producer.cpp
index 90d0d20322d3c47af246f915760c2e8be4f1629a..de52f364059c176ab136825b89d072c9e6dba669 100644 (file)
--- a/modules/ffmpeg/producer/ffmpeg_producer.cpp
+++ b/modules/ffmpeg/producer/ffmpeg_producer.cpp
@@ -117,7 +117,7 @@ public:
        {\r
                perf_timer_.restart();\r
 \r
-               for(size_t n = 0; ouput_channel_.size() < 2 && input_.has_packet() && n < 32; ++n) // 32 packets should be enough. Otherwise there probably was an error and we want to avoid infinite recursion.\r
+               for(size_t n = 0; ouput_channel_.size() < 2 && input_.has_packet() && n < 32; ++n) // 32 packets should be enough. Otherwise there probably was an error and we want to avoid infinite looping.\r
                {       \r
                        tbb::parallel_invoke\r
                        (\r
@@ -231,7 +231,7 @@ public:
 \r
        bool is_eof() const\r
        {\r
-               return ouput_channel_.empty() && (!video_decoder_ && !audio_decoder_) || !input_.is_running();\r
+               return ouput_channel_.empty() && ((!video_decoder_ && !audio_decoder_) || !input_.is_running());\r
        }\r
 };\r
 \r