X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fffmpeg%2Fffmpeg.cpp;h=87e1e00833d8308f08941dcb4e6e5eeddc33b14c;hb=ac7b3acb915f90de6b224e54a2240023fc221e5a;hp=13089c16c102ea46b7d39b31241609f092e49af3;hpb=e59ee903385d31db9a4fc928f32d3be5322b3389;p=casparcg

diff --git a/modules/ffmpeg/ffmpeg.cpp b/modules/ffmpeg/ffmpeg.cpp
index 13089c16c..87e1e0083 100644
--- a/modules/ffmpeg/ffmpeg.cpp
+++ b/modules/ffmpeg/ffmpeg.cpp
@@ -46,7 +46,7 @@ extern "C"
 	#include <libavfilter/avfilter.h>
 }
 
-namespace caspar {
+namespace caspar { namespace ffmpeg {
 	
 int ffmpeg_lock_callback(void **mutex, enum AVLockOp op) 
 { 
@@ -151,7 +151,7 @@ void log_callback(void* ptr, int level, const char* fmt, va_list vl)
     //colored_fputs(av_clip(level>>3, 0, 6), line);
 }
 
-void init_ffmpeg()
+void init()
 {
     avfilter_register_all();
 	av_register_all();
@@ -161,10 +161,10 @@ void init_ffmpeg()
 	av_log_set_callback(log_callback);
 	
 	//core::register_consumer_factory([](const std::vector<std::wstring>& params){return create_ffmpeg_consumer(params);});
-	core::register_producer_factory(create_ffmpeg_producer);
+	core::register_producer_factory(create_producer);
 }
 
-void uninit_ffmpeg()
+void uninit()
 {
 	avfilter_uninit();
 	av_lockmgr_register(nullptr);
@@ -202,4 +202,4 @@ std::wstring get_swscale_version()
 	return make_version(swscale_version());
 }
 
-}
\ No newline at end of file
+}}
\ No newline at end of file