git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/branches...

diff --git a/core/producer/frame/basic_frame.cpp b/core/producer/frame/basic_frame.cpp
index 34de9fd21a10f5cb1a3a7de76e39c26155e322e9..cccafecff61bc75404732808dc6d8940bd068a8d 100644 (file)
--- a/core/producer/frame/basic_frame.cpp
+++ b/core/producer/frame/basic_frame.cpp
@@ -145,4 +145,11 @@ safe_ptr<basic_frame> basic_frame::fill_and_key(const safe_ptr<basic_frame>& fil
        return make_safe<basic_frame>(std::move(frames));\r
 }\r
        \r
+safe_ptr<basic_frame> disable_audio(const safe_ptr<basic_frame>& frame)\r
+{\r
+       auto frame2 = make_safe<basic_frame>(frame);\r
+       frame2->get_frame_transform().volume = 0.0;\r
+       return frame2;\r
+}\r
+       \r
 }}
\ No newline at end of file

diff --git a/core/producer/frame/basic_frame.h b/core/producer/frame/basic_frame.h
index 601fd9af3c0df295665e7ab9027f462f2b1b9adc..06dbce553c8f59754e3a50649b3886c45d0f09db 100644 (file)
--- a/core/producer/frame/basic_frame.h
+++ b/core/producer/frame/basic_frame.h
@@ -77,15 +77,7 @@ private:
        struct implementation;\r
        safe_ptr<implementation> impl_;\r
 };\r
-\r
-inline bool is_concrete_frame(const safe_ptr<basic_frame>& frame)\r
-{\r
-       return frame != basic_frame::empty() && frame != basic_frame::eof() && frame != basic_frame::late();\r
-}\r
-\r
-inline bool is_concrete_frame(const std::shared_ptr<basic_frame>& frame)\r
-{\r
-       return frame != nullptr && frame.get() != basic_frame::empty().get() && frame.get() != basic_frame::eof().get() && frame.get() != basic_frame::late().get();\r
-}\r
+       \r
+safe_ptr<basic_frame> disable_audio(const safe_ptr<basic_frame>& frame);\r
 \r
 }}
\ No newline at end of file

diff --git a/core/producer/layer.cpp b/core/producer/layer.cpp
index 1e8c2d127ad465d6c685fa8c7ef9514e5289ad52..27732d69e2af10c1a24591d6e309e2c015443679 100644 (file)
--- a/core/producer/layer.cpp
+++ b/core/producer/layer.cpp
@@ -30,13 +30,6 @@
 #include <boost/property_tree/ptree.hpp>\r
 \r
 namespace caspar { namespace core {\r
-       \r
-safe_ptr<basic_frame> disable_audio(const safe_ptr<basic_frame>& frame)\r
-{\r
-       auto frame2 = make_safe<basic_frame>(frame);\r
-       frame2->get_frame_transform().volume = 0.0;\r
-       return frame2;\r
-}\r
 \r
 struct layer::implementation\r
 {                              \r

diff --git a/modules/ffmpeg/producer/ffmpeg_producer.cpp b/modules/ffmpeg/producer/ffmpeg_producer.cpp
index c5c85c4d1189697ab3f6e136e7df21ae3f47616d..8ce8a9f4217cc75293cfc7d7d87a8fcad1380f96 100644 (file)
--- a/modules/ffmpeg/producer/ffmpeg_producer.cpp
+++ b/modules/ffmpeg/producer/ffmpeg_producer.cpp
@@ -148,7 +148,7 @@ public:
                graph_->set_value("frame-time", frame_timer_.elapsed()*format_desc_.fps*0.5);\r
                                \r
                if(frame_buffer_.empty() && input_.eof())\r
-                       return last_frame();\r
+                       return disable_audio(last_frame());\r
 \r
                if(frame_buffer_.empty())\r
                {\r