]> git.sesse.net Git - casparcg/commitdiff
[ffmpeg] Fixed problem where pan audio filter was not correctly parsed in Linux becau...
authorHelge Norberg <helge.norberg@svt.se>
Mon, 3 Oct 2016 19:53:48 +0000 (21:53 +0200)
committerHelge Norberg <helge.norberg@svt.se>
Mon, 3 Oct 2016 19:53:48 +0000 (21:53 +0200)
shell/main.cpp

index d742cb0d9c633f6fe2361cae894035aaa11178f3..f5499b9588240b7d415847f1f9aead08aa2808f5 100644 (file)
@@ -79,6 +79,9 @@ void setup_global_locale()
        gen.categories(boost::locale::codepage_facet);
 
        std::locale::global(gen(""));
+
+       // sscanf is used in for example FFmpeg where we want decimals to be parsed as .
+       std::setlocale(LC_ALL, "C");
 }
 
 void print_info()
@@ -217,6 +220,9 @@ bool run(const std::wstring& config_file_name, tbb::atomic<bool>& should_wait_fo
        // Create server object which initializes channels, protocols and controllers.
        std::unique_ptr<server> caspar_server(new server(shutdown_server_now));
 
+       // For example CEF resets the global locale, so this is to reset it back to "our" preference.
+       setup_global_locale();
+
        // Print environment information.
        print_system_info(caspar_server->get_system_info_provider_repo());