Merge master.
authorCarl Hetherington <cth@carlh.net>
Mon, 11 Aug 2014 21:39:20 +0000 (22:39 +0100)
committerCarl Hetherington <cth@carlh.net>
Mon, 11 Aug 2014 21:39:20 +0000 (22:39 +0100)
commitcc27c2716f755305d67f1e1ba828ecf37f8405dd
tree224d2b1c469bc671e6b826e8a535f61f6459bc81
parent4ddf91dda7d84f169e4b905fd41cf747f4a0102c
parent491daf8790f35611052d8954d5d74df275dcda18
Merge master.
27 files changed:
ChangeLog
debian/changelog
platform/osx/make_dmg.sh
src/lib/analyse_audio_job.cc
src/lib/analyse_audio_job.h
src/lib/audio_decoder.cc
src/lib/colour_conversion.cc
src/lib/encoder.cc
src/lib/ffmpeg.cc
src/lib/ffmpeg_decoder.cc
src/lib/image_proxy.cc
src/lib/job.cc
src/lib/playlist.cc
src/lib/ratio.cc
src/lib/send_kdm_email_job.cc
src/lib/send_kdm_email_job.h
src/lib/transcode_job.cc
src/lib/writer.cc
src/lib/wscript
src/tools/dcpomatic.cc
src/tools/dcpomatic_cli.cc
src/wx/timecode.cc
src/wx/timecode.h
src/wx/timing_panel.cc
src/wx/video_panel.cc
test/film_metadata_test.cc
test/job_test.cc