Mostly-merge master.
authorCarl Hetherington <cth@carlh.net>
Fri, 21 Mar 2014 12:36:17 +0000 (12:36 +0000)
committerCarl Hetherington <cth@carlh.net>
Fri, 21 Mar 2014 12:36:17 +0000 (12:36 +0000)
commite6f28e7cda23c1ba3c49cc1bf2dc1491c2f87160
treeab7de2b131c3543d170b167c8b93ea2113ac112e
parent76f601f5edbdfceec91ff6f6ce4b310e0d3a6ce9
parent4ec7a8070dfcda1fa327df6378eaab754f119f1b
Mostly-merge master.
16 files changed:
ChangeLog
cscript
src/lib/ffmpeg.cc
src/lib/ffmpeg_content.cc
src/lib/ffmpeg_decoder.h
src/lib/image.cc
src/lib/image_content.cc
src/lib/types.h
src/lib/util.cc
src/lib/video_content.cc
src/lib/video_content.h
src/lib/video_decoder.cc
src/wx/timecode.cc
src/wx/timing_panel.cc
src/wx/video_panel.cc
test/play_test.cc