Merge master.
authorCarl Hetherington <cth@carlh.net>
Sat, 23 Aug 2014 21:50:40 +0000 (22:50 +0100)
committerCarl Hetherington <cth@carlh.net>
Sat, 23 Aug 2014 21:50:40 +0000 (22:50 +0100)
commit8c7a308c03e4b4196b4e2379a26d432b100ae2b1
tree605c8b62f56c5f9be2ff77161eb18ac372083a35
parent04acfa42cdffd5938358847ebee822399ef978e6
parenta6d6a794b28c3b3e6679f01c1890f396453eb5ac
Merge master.
30 files changed:
ChangeLog
debian/changelog
src/lib/analyse_audio_job.cc
src/lib/config.cc
src/lib/content.cc
src/lib/dcp_video.cc
src/lib/ffmpeg_content.cc
src/lib/ffmpeg_decoder.cc
src/lib/ffmpeg_examiner.cc
src/lib/film.cc
src/lib/filter_graph.cc
src/lib/image_content.cc
src/lib/job.cc
src/lib/kdm.cc
src/lib/server.cc
src/lib/server_finder.cc
src/lib/sndfile_content.cc
src/lib/transcode_job.cc
src/lib/update.cc
src/lib/util.cc
src/lib/video_content.cc
src/lib/wscript
src/tools/dcpomatic.cc
src/tools/dcpomatic_kdm.cc
src/tools/dcpomatic_server_cli.cc
src/wx/about_dialog.cc
src/wx/film_editor.cc
src/wx/properties_dialog.cc
src/wx/timing_panel.cc
test/film_metadata_test.cc