Merge master.
authorCarl Hetherington <cth@carlh.net>
Tue, 4 Mar 2014 20:27:27 +0000 (20:27 +0000)
committerCarl Hetherington <cth@carlh.net>
Tue, 4 Mar 2014 20:27:27 +0000 (20:27 +0000)
commita79d78d8bb6d51f6662f1f63b9f8fd19e1a0c5f1
tree4b696815a80903ade7df8eccec23160b97e5ee05
parent1b1bc528ee5ca1fee1bd33f9fb6f79cd551e3b33
parent5f66a692647fc901f7dca709ad08c65010bd84e7
Merge master.
14 files changed:
src/lib/ffmpeg_content.cc
src/lib/film.cc
src/lib/image.cc
src/lib/image_content.cc
src/lib/image_content.h
src/lib/player.cc
src/lib/util.cc
src/lib/video_content.cc
src/lib/video_content.h
src/wx/video_panel.cc
test/black_fill_test.cc
test/ffmpeg_audio_test.cc
test/scaling_test.cc
wscript