X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fffmpeg%2Fproducer%2Fffmpeg_producer.cpp;h=480e95b8d0d3739eb4db855e35613adc428ca9fc;hb=ac7b3acb915f90de6b224e54a2240023fc221e5a;hp=d1ca8c0295a97d0f420c87ef472398903f3f0778;hpb=e59ee903385d31db9a4fc928f32d3be5322b3389;p=casparcg

diff --git a/modules/ffmpeg/producer/ffmpeg_producer.cpp b/modules/ffmpeg/producer/ffmpeg_producer.cpp
index d1ca8c029..480e95b8d 100644
--- a/modules/ffmpeg/producer/ffmpeg_producer.cpp
+++ b/modules/ffmpeg/producer/ffmpeg_producer.cpp
@@ -46,7 +46,7 @@
 
 #include <tbb/parallel_invoke.h>
 
-namespace caspar {
+namespace caspar { namespace ffmpeg {
 				
 struct ffmpeg_producer : public core::frame_producer
 {
@@ -221,7 +221,7 @@ public:
 	}
 };
 
-safe_ptr<core::frame_producer> create_ffmpeg_producer(const safe_ptr<core::frame_factory>& frame_factory, const std::vector<std::wstring>& params)
+safe_ptr<core::frame_producer> create_producer(const safe_ptr<core::frame_factory>& frame_factory, const std::vector<std::wstring>& params)
 {		
 	static const std::vector<std::wstring> extensions = boost::assign::list_of
 		(L"mpg")(L"mpeg")(L"m2v")(L"m4v")(L"mp3")(L"mp4")(L"mpga")
@@ -259,4 +259,4 @@ safe_ptr<core::frame_producer> create_ffmpeg_producer(const safe_ptr<core::frame
 	return make_safe<ffmpeg_producer>(frame_factory, path, filter_str, loop, start, length);
 }
 
-}
\ No newline at end of file
+}}
\ No newline at end of file