From f19e63d38b7e321caa3cd8d7d17d34c7508e1857 Mon Sep 17 00:00:00 2001
From: ronag <ronag@362d55ac-95cf-4e76-9f9a-cbaa9c17b72d>
Date: Sat, 17 Dec 2011 15:29:52 +0000
Subject: [PATCH] git-svn-id:
 https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/branches/2.1.0@1906
 362d55ac-95cf-4e76-9f9a-cbaa9c17b72d

---
 core/producer/frame/basic_frame.cpp         |  7 +++++++
 core/producer/frame/basic_frame.h           | 12 ++----------
 core/producer/layer.cpp                     |  7 -------
 modules/ffmpeg/producer/ffmpeg_producer.cpp |  2 +-
 4 files changed, 10 insertions(+), 18 deletions(-)

diff --git a/core/producer/frame/basic_frame.cpp b/core/producer/frame/basic_frame.cpp
index 34de9fd21..cccafecff 100644
--- 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));
 }
 	
+safe_ptr<basic_frame> disable_audio(const safe_ptr<basic_frame>& frame)
+{
+	auto frame2 = make_safe<basic_frame>(frame);
+	frame2->get_frame_transform().volume = 0.0;
+	return frame2;
+}
+	
 }}
\ No newline at end of file
diff --git a/core/producer/frame/basic_frame.h b/core/producer/frame/basic_frame.h
index 601fd9af3..06dbce553 100644
--- a/core/producer/frame/basic_frame.h
+++ b/core/producer/frame/basic_frame.h
@@ -77,15 +77,7 @@ private:
 	struct implementation;
 	safe_ptr<implementation> impl_;
 };
-
-inline bool is_concrete_frame(const safe_ptr<basic_frame>& frame)
-{
-	return frame != basic_frame::empty() && frame != basic_frame::eof() && frame != basic_frame::late();
-}
-
-inline bool is_concrete_frame(const std::shared_ptr<basic_frame>& frame)
-{
-	return frame != nullptr && frame.get() != basic_frame::empty().get() && frame.get() != basic_frame::eof().get() && frame.get() != basic_frame::late().get();
-}
+	
+safe_ptr<basic_frame> disable_audio(const safe_ptr<basic_frame>& frame);
 
 }}
\ No newline at end of file
diff --git a/core/producer/layer.cpp b/core/producer/layer.cpp
index 1e8c2d127..27732d69e 100644
--- a/core/producer/layer.cpp
+++ b/core/producer/layer.cpp
@@ -30,13 +30,6 @@
 #include <boost/property_tree/ptree.hpp>
 
 namespace caspar { namespace core {
-	
-safe_ptr<basic_frame> disable_audio(const safe_ptr<basic_frame>& frame)
-{
-	auto frame2 = make_safe<basic_frame>(frame);
-	frame2->get_frame_transform().volume = 0.0;
-	return frame2;
-}
 
 struct layer::implementation
 {				
diff --git a/modules/ffmpeg/producer/ffmpeg_producer.cpp b/modules/ffmpeg/producer/ffmpeg_producer.cpp
index c5c85c4d1..8ce8a9f42 100644
--- 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);
 				
 		if(frame_buffer_.empty() && input_.eof())
-			return last_frame();
+			return disable_audio(last_frame());
 
 		if(frame_buffer_.empty())
 		{
-- 
2.39.5