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 2774621654ea57dba77b1ea7326185fe69f98996..dc497b8e3695e6b768563c0b49a1bd81f526f547 100644 (file)
--- a/modules/ffmpeg/producer/muxer/frame_muxer.cpp
+++ b/modules/ffmpeg/producer/muxer/frame_muxer.cpp
@@ -61,7 +61,7 @@ struct frame_muxer2::implementation : public Concurrency::agent, boost::noncopya
        governor                                                                                        governor_;\r
 \r
        tbb::atomic<bool>                                                                       is_running_;\r
-       \r
+               \r
        implementation(frame_muxer2::video_source_t* video_source,\r
                                   frame_muxer2::audio_source_t* audio_source,\r
                                   frame_muxer2::target_t& target,\r
@@ -131,13 +131,7 @@ struct frame_muxer2::implementation : public Concurrency::agent, boost::noncopya
                std::shared_ptr<core::audio_buffer> audio = receive(audio_source_);\r
 \r
                if(audio == flush_audio())\r
-               {\r
-                       if(!audio_data_.empty())\r
-                       {\r
-                               CASPAR_LOG(info) << L"[frame_muxer] Truncating audio: " << audio_data_.size();\r
-                               audio_data_.clear();\r
-                       }\r
-               }\r
+                       return receive_audio();\r
 \r
                if(audio == eof_audio())\r
                        return nullptr;\r