Fix merge.

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

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

diff --cc src/wx/film_viewer.cc
Simple merge