Merge master.
authorCarl Hetherington <cth@carlh.net>
Mon, 2 Jun 2014 11:06:20 +0000 (12:06 +0100)
committerCarl Hetherington <cth@carlh.net>
Mon, 2 Jun 2014 11:06:20 +0000 (12:06 +0100)
commit3574212ee42b2bd924eb95d5c0f4f69ec9e0a2f0
tree24e46f4f566bfb98aa48e9dab602ec1c8d0591d6
parent24d54ea7fe1ba128cf8d3521d6738fc73a7c623e
parent8fb0f4eaa6d91ca9369f45dd7a57c29149edaaac
Merge master.
34 files changed:
ChangeLog
src/lib/config.cc
src/lib/config.h
src/lib/content.h
src/lib/cross.cc
src/lib/dcp_video_frame.cc
src/lib/decoder.h
src/lib/encoder.cc
src/lib/ffmpeg_content.cc
src/lib/ffmpeg_decoder.cc
src/lib/ffmpeg_examiner.cc
src/lib/film.cc
src/lib/film.h
src/lib/image_decoder.cc
src/lib/image_proxy.cc
src/lib/job.cc
src/lib/kdm.cc
src/lib/kdm.h
src/lib/player.cc
src/lib/player_video_frame.cc
src/lib/player_video_frame.h
src/lib/server.cc
src/lib/transcode_job.cc
src/lib/types.h
src/lib/util.h
src/lib/writer.cc
src/tools/dcpomatic.cc
src/tools/dcpomatic_cli.cc
src/tools/dcpomatic_kdm.cc
src/wx/about_dialog.cc
src/wx/config_dialog.cc
src/wx/film_editor.cc
test/client_server_test.cc
test/ffmpeg_dcp_test.cc