git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/branches...

diff --git a/modules/ffmpeg/producer/muxer/frame_muxer.cpp b/modules/ffmpeg/producer/muxer/frame_muxer.cpp
index c4dbfbf375106069ded2d90ee9cbc8bf62de1ee1..1f65249a5a09467708d02e12922386a5d91450ae 100644 (file)
--- a/modules/ffmpeg/producer/muxer/frame_muxer.cpp
+++ b/modules/ffmpeg/producer/muxer/frame_muxer.cpp
@@ -166,7 +166,7 @@ struct frame_muxer::impl : boost::noncopyable
                \r
        void merge()\r
        {\r
-               if(video_ready() && audio_ready() && display_mode_ != display_mode::invalid)\r
+               while(video_ready() && audio_ready() && display_mode_ != display_mode::invalid)\r
                {                               \r
                        auto frame1                     = pop_video();\r
                        frame1.audio_data()     = pop_audio();\r