Merge master.
authorCarl Hetherington <cth@carlh.net>
Thu, 12 Jun 2014 21:27:11 +0000 (22:27 +0100)
committerCarl Hetherington <cth@carlh.net>
Thu, 12 Jun 2014 21:27:11 +0000 (22:27 +0100)
commit4e411ea97b4dab8a5fa282d1d4cf7971ef1e24ad
tree06db8731e77dfeaf537f2814d73c7a599035b95c
parent8102046b2f29e0c7b234c29bf204b056cb30e64f
parent66162217d93baa3fd50594bb013a44bbd779d02a
Merge master.
50 files changed:
ChangeLog
cscript
src/lib/audio_content.cc
src/lib/audio_content.h
src/lib/config.cc
src/lib/config.h
src/lib/content.cc
src/lib/dcp_content_type.cc
src/lib/dcp_content_type.h
src/lib/ffmpeg_content.cc
src/lib/film.cc
src/lib/film.h
src/lib/frame_rate_change.h
src/lib/image_content.cc
src/lib/image_proxy.cc
src/lib/isdcf_metadata.cc
src/lib/isdcf_metadata.h
src/lib/player.cc
src/lib/playlist.h
src/lib/ratio.cc
src/lib/ratio.h
src/lib/server.cc
src/lib/sndfile_content.cc
src/lib/util.cc
src/lib/video_content.cc
src/lib/wscript
src/tools/dcpomatic_create.cc
src/wx/about_dialog.cc
src/wx/audio_panel.cc
src/wx/config_dialog.cc
src/wx/content_widget.h
src/wx/film_editor.cc
src/wx/timeline.cc
src/wx/timeline.h
src/wx/timing_panel.cc
src/wx/video_panel.cc
src/wx/wscript
src/wx/wx_util.cc
test/4k_test.cc
test/audio_delay_test.cc
test/black_fill_test.cc
test/client_server_test.cc
test/colour_conversion_test.cc
test/film_metadata_test.cc
test/frame_rate_test.cc
test/recover_test.cc
test/scaling_test.cc
test/silence_padding_test.cc
test/test.cc
test/wscript