]> git.sesse.net Git - casparcg/commitdiff
basic_frame/disable_audio: Just forward empty frames.
authorronag <ronag@362d55ac-95cf-4e76-9f9a-cbaa9c17b72d>
Mon, 7 Jan 2013 16:49:21 +0000 (16:49 +0000)
committerronag <ronag@362d55ac-95cf-4e76-9f9a-cbaa9c17b72d>
Mon, 7 Jan 2013 16:49:21 +0000 (16:49 +0000)
git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/trunk@3645 362d55ac-95cf-4e76-9f9a-cbaa9c17b72d

core/producer/frame/basic_frame.cpp

index 8a3b2327864d86288e55ca5e644d57220ca63f3f..ce4f773a1aad73c56870aafcfb278c9376146c9d 100644 (file)
@@ -147,6 +147,9 @@ safe_ptr<basic_frame> basic_frame::fill_and_key(const safe_ptr<basic_frame>& fil
 \r
 safe_ptr<basic_frame> disable_audio(const safe_ptr<basic_frame>& frame)\r
 {\r
+       if(frame == basic_frame::empty())\r
+               return frame;\r
+\r
        basic_frame frame2 = frame;\r
        frame2.get_frame_transform().volume = 0.0;\r
        return make_safe<basic_frame>(std::move(frame2));\r