Merge branch 'master' into subs

diff --cc src/lib/ffmpeg_decoder.cc
Simple merge

diff --cc src/lib/film.cc
Simple merge

diff --cc src/lib/film_state.cc
Simple merge