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

diff --cc modules/ffmpeg/producer/audio/audio_decoder.cpp
Simple merge

diff --cc modules/ffmpeg/producer/ffmpeg_producer.cpp
Simple merge

diff --cc modules/ffmpeg/producer/input/input.cpp
Simple merge

diff --cc modules/ffmpeg/producer/video/video_decoder.cpp
Simple merge