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 1f65249a5a09467708d02e12922386a5d91450ae..6e7166d2369a3a3f47fd28140f0cdcefc25f42bf 100644 (file)
--- a/modules/ffmpeg/producer/muxer/frame_muxer.cpp
+++ b/modules/ffmpeg/producer/muxer/frame_muxer.cpp
@@ -143,7 +143,7 @@ struct frame_muxer::impl : boost::noncopyable
                switch(display_mode_)\r
                {\r
                case display_mode::duplicate:                                   \r
-                       return audio_stream_.size()/2 >= static_cast<size_t>(audio_cadence_.front());\r
+                       return audio_stream_.size() >= static_cast<size_t>(audio_cadence_[0] + audio_cadence_[1 % audio_cadence_.size()]);\r
                default:                                                                                \r
                        return audio_stream_.size() >= static_cast<size_t>(audio_cadence_.front());\r
                }\r
@@ -222,6 +222,9 @@ struct frame_muxer::impl : boost::noncopyable
 \r
        core::audio_buffer pop_audio()\r
        {\r
+               if(audio_stream_.size() < audio_cadence_.front())\r
+                       BOOST_THROW_EXCEPTION(out_of_range());\r
+\r
                auto begin = audio_stream_.begin();\r
                auto end   = begin + audio_cadence_.front();\r
 \r