Merge master.
authorCarl Hetherington <cth@carlh.net>
Mon, 6 Jan 2014 13:29:00 +0000 (13:29 +0000)
committerCarl Hetherington <cth@carlh.net>
Mon, 6 Jan 2014 13:29:00 +0000 (13:29 +0000)
commitae9b0b509787d244366eb8f69bdf9d563b6c6bb6
tree571878e1daeafb0a5583e3d13cb6109e987623d1
parentd7b23d44dec9d6357619e8e009e564e475215470
parent3a51cc23de37ff0821009af780ef56e0e28394f7
Merge master.
src/lib/ffmpeg_decoder.cc
src/lib/util.cc
src/wx/film_editor.cc
src/wx/video_panel.cc