]> git.sesse.net Git - casparcg/commitdiff
git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/branches...
authorronag <ronag@362d55ac-95cf-4e76-9f9a-cbaa9c17b72d>
Sun, 11 Dec 2011 10:01:59 +0000 (10:01 +0000)
committerronag <ronag@362d55ac-95cf-4e76-9f9a-cbaa9c17b72d>
Sun, 11 Dec 2011 10:01:59 +0000 (10:01 +0000)
modules/ffmpeg/ffmpeg.cpp

index d6e2c3a5354d901fbd98874765999b89599567aa..02d302e937b83b240be4130837dcbaf944c9c825 100644 (file)
@@ -193,14 +193,14 @@ void log_callback(void* ptr, int level, const char* fmt, va_list vl)
 \r
 void init()\r
 {\r
+       av_lockmgr_register(ffmpeg_lock_callback);\r
+       av_log_set_callback(log_callback);\r
     avfilter_register_all();\r
        //fix_yadif_filter_format_query();\r
        av_register_all();\r
     avformat_network_init();\r
        avcodec_init();\r
     avcodec_register_all();\r
-       av_lockmgr_register(ffmpeg_lock_callback);\r
-       av_log_set_callback(log_callback);\r
        \r
        core::register_consumer_factory([](const std::vector<std::wstring>& params){return create_consumer(params);});\r
        core::register_producer_factory(create_producer);\r