]> 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>
Tue, 14 Feb 2012 00:14:12 +0000 (00:14 +0000)
committerronag <ronag@362d55ac-95cf-4e76-9f9a-cbaa9c17b72d>
Tue, 14 Feb 2012 00:14:12 +0000 (00:14 +0000)
modules/ffmpeg/producer/muxer/frame_muxer.cpp

index 80bad4918a0ae9fda71686fc11412ad5536c7a69..e008443abf9fae7be0ecfe8217981d7e2413d27f 100644 (file)
@@ -264,11 +264,10 @@ struct frame_muxer::impl : boost::noncopyable
                                frame_buffer_.push(spl::make_shared<draw_frame>(frame1));\r
                                break;\r
                        }\r
+               default:\r
+                       BOOST_THROW_EXCEPTION(invalid_operation());\r
                }\r
                \r
-               if(frame_buffer_.empty())\r
-                       return false;\r
-\r
                return try_pop(result);\r
        }\r
        \r