Merge branch 'master' of https://github.com/CasparCG/Server

diff --cc modules/image/producer/image_producer.cpp
index 6c01f315abbd506e68777da8f2a645f55267242f,73d739dc3094da2f5ac8fea3b88ad276cde453f3..b47d2ac31cfc48322007f30276d2c0573d652018
--- 1/modules/image/producer/image_producer.cpp
--- 2/modules/image/producer/image_producer.cpp
+++ b/modules/image/producer/image_producer.cpp
@@@ -111,22 -95,10 +111,22 @@@ struct image_producer : public core::fr
        }\r
  };\r
  \r
 -safe_ptr<core::frame_producer> create_raw_producer(const safe_ptr<core::frame_factory>& frame_factory, const std::vector<std::wstring>& params)\r
 +safe_ptr<core::frame_producer> create_raw_producer(const safe_ptr<core::frame_factory>& frame_factory,\r
 +              const std::vector<std::wstring>& params,\r
 +              const std::vector<std::wstring>& original_case_params)\r
  {\r
 +      if (params[0] == L"[PNG_BASE64]")\r
 +      {\r
 +              if (params.size() < 2)\r
 +                      return core::frame_producer::empty();\r
 +\r
 +              auto png_data = from_base64(narrow(original_case_params[1]));\r
 +\r
 +              return make_safe<image_producer>(frame_factory, png_data.data(), png_data.size());\r
 +      }\r
 +\r
        static const std::vector<std::wstring> extensions = list_of(L"png")(L"tga")(L"bmp")(L"jpg")(L"jpeg")(L"gif")(L"tiff")(L"tif")(L"jp2")(L"jpx")(L"j2k")(L"j2c");\r
-       std::wstring filename = env::media_folder() + L"\\" + params[0];\r
+       std::wstring filename = env::media_folder() + params[0];\r
        \r
        auto ext = std::find_if(extensions.begin(), extensions.end(), [&](const std::wstring& ex) -> bool\r
                {                                       \r

diff --cc modules/image/util/image_loader.cpp
Simple merge