Merge master.
authorCarl Hetherington <cth@carlh.net>
Fri, 16 May 2014 11:32:04 +0000 (12:32 +0100)
committerCarl Hetherington <cth@carlh.net>
Fri, 16 May 2014 11:32:04 +0000 (12:32 +0100)
commit308488324dbc4d8b709d3fb1dc9fee0479346c21
tree446989a0bea3db683e5200da89c955140b175682
parentcfdd68eb5fb0ef8423e860103ad4e5510994f1da
parent362ed9ee4f73bee21b3ef8d3b449bb8e8877f501
Merge master.
31 files changed:
ChangeLog
src/lib/audio_content.cc
src/lib/audio_mapping.cc
src/lib/colour_conversion.cc
src/lib/config.cc
src/lib/config.h
src/lib/content.cc
src/lib/dci_metadata.cc
src/lib/dcp_video_frame.cc
src/lib/ffmpeg.cc
src/lib/ffmpeg_content.cc
src/lib/ffmpeg_content.h
src/lib/ffmpeg_decoder.cc
src/lib/film.cc
src/lib/image_examiner.cc
src/lib/kdm.cc
src/lib/playlist.cc
src/lib/server.cc
src/lib/server_finder.cc
src/lib/sndfile_content.cc
src/lib/subrip_content.cc
src/lib/subtitle_content.cc
src/lib/update.cc
src/lib/util.cc
src/lib/util.h
src/lib/video_content.cc
src/tools/dcpomatic.cc
src/wx/audio_mapping_view.cc
src/wx/config_dialog.cc
src/wx/film_editor.cc
test/ratio_test.cc