Merge master.
authorCarl Hetherington <cth@carlh.net>
Thu, 9 Jan 2014 22:18:42 +0000 (22:18 +0000)
committerCarl Hetherington <cth@carlh.net>
Thu, 9 Jan 2014 22:18:42 +0000 (22:18 +0000)
commite8204f55c981493b99814f71a50b3c3d62601032
tree19e155586aca13839e440a0574ed5aa5cfa4c4d5
parentae9b0b509787d244366eb8f69bdf9d563b6c6bb6
parente28def57ff4591f02ca3585a506ea58fbeba5d46
Merge master.
13 files changed:
src/lib/content.cc
src/lib/ffmpeg_content.cc
src/lib/ffmpeg_decoder.cc
src/lib/film.cc
src/lib/film.h
src/lib/image_content.cc
src/lib/image_content.h
src/lib/player.cc
src/lib/sndfile_content.cc
src/lib/video_content.h
src/wx/timecode.cc
src/wx/timecode.h
test/wscript