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

Conflicts:
	modules/image/producer/image_producer.cpp

diff --cc core/producer/text/utils/text_info.h
index 5896e0a6b659a8e085eb011e983893882f96a77f,0bfc5ea25041aa4c342f014f16feddf76989b4da..c3b90df3ffcff5b9a0f3684fcbfe6b133850943f
--- 1/core/producer/text/utils/text_info.h
--- 2/core/producer/text/utils/text_info.h
+++ b/core/producer/text/utils/text_info.h
@@@ -12,12 -12,15 +12,19 @@@ namespace caspar { namespace core { nam
  
                float size;
                color<float> color;
 +              //int shadow_distance;
 +              //int shadow_size;
 +              //float shadow_spread;
 +              //color<float> shadow_color;
                int baseline_shift;
                int tracking;
+ 
+               text_info()
+                       : size(0.0f)
+                       , baseline_shift(0)
+                       , tracking(0)
+               {
+               }
        };
  
  }}}

diff --cc modules/image/producer/image_producer.cpp
index abcb4414e1344f8946133d1b97ff2e2575481e25,dcf2323522d45860bd260d1f3d208f2ad3ed1c6f..802771f68d0bcf2399b87382cb6a9ba91a4bbaa8
--- 1/modules/image/producer/image_producer.cpp
--- 2/modules/image/producer/image_producer.cpp
+++ b/modules/image/producer/image_producer.cpp
@@@ -138,14 -214,5 +219,9 @@@ spl::shared_ptr<core::frame_producer> c
        return spl::make_shared<image_producer>(frame_factory, filename + *ext);
  }
  
- spl::shared_ptr<core::frame_producer> create_producer(const spl::shared_ptr<core::frame_factory>& frame_factory, const core::video_format_desc& format_desc, const std::vector<std::wstring>& params)
- {
-       return create_raw_producer(frame_factory, format_desc, params);
- }
  
-       return create_raw_producer(frame_factory, format_desc, params);
 +spl::shared_ptr<core::frame_producer> create_thumbnail_producer(const spl::shared_ptr<core::frame_factory>& frame_factory, const core::video_format_desc& format_desc, const std::vector<std::wstring>& params)
 +{
- 
++      return caspar::image::create_producer(frame_factory, format_desc, params);
 +}
  }}