]> git.sesse.net Git - casparcg/commitdiff
git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/branches...
authorronag <ronag@362d55ac-95cf-4e76-9f9a-cbaa9c17b72d>
Sun, 4 Dec 2011 14:14:41 +0000 (14:14 +0000)
committerronag <ronag@362d55ac-95cf-4e76-9f9a-cbaa9c17b72d>
Sun, 4 Dec 2011 14:14:41 +0000 (14:14 +0000)
modules/ffmpeg/producer/muxer/frame_muxer.cpp

index 66c8be37905169c3b395a2c7fbb2b0ea0823ecc2..3c9c09f89bcbae4e879ffdac09c45eed3346a993 100644 (file)
@@ -216,7 +216,7 @@ struct frame_muxer::implementation : boost::noncopyable
                        audio_streams_.pop();\r
                }\r
 \r
-               if(!video_ready2() || !audio_ready2())\r
+               if(!video_ready2() || !audio_ready2() || display_mode_ == display_mode::invalid)\r
                        return nullptr;\r
                                \r
                auto frame1                             = pop_video();\r