Merge master.

diff --cc ChangeLog
Simple merge

diff --cc debian/changelog
Simple merge

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

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