Merge master and multifarious hackery.
authorCarl Hetherington <cth@carlh.net>
Sat, 25 May 2013 00:07:35 +0000 (01:07 +0100)
committerCarl Hetherington <cth@carlh.net>
Sat, 25 May 2013 00:07:35 +0000 (01:07 +0100)
commit996b0c06e23bcb6b300d7b8799df94993692e07d
tree615ff0c372dac97321489e3cb7f316cb4cb9eeec
parent4f03da3aa12525cb8389ddefee629f5d0b2ac0aa
parent907735ee6ca162583c7c9d20f5603a6db83a149f
Merge master and multifarious hackery.
33 files changed:
cscript
src/lib/ab_transcode_job.cc
src/lib/audio_decoder.cc
src/lib/dcp_video_frame.cc
src/lib/dcp_video_frame.h
src/lib/encoder.cc
src/lib/ffmpeg_content.cc
src/lib/ffmpeg_content.h
src/lib/ffmpeg_decoder.cc
src/lib/ffmpeg_decoder.h
src/lib/film.cc
src/lib/film.h
src/lib/filter_graph.cc
src/lib/filter_graph.h
src/lib/image.h
src/lib/player.cc
src/lib/po/fr_FR.po
src/lib/server.cc
src/lib/sndfile_decoder.cc
src/lib/wscript
src/tools/dcpomatic_cli.cc
src/wx/film_editor.cc
src/wx/film_viewer.cc
test/client_server_test.cc
test/dcp_test.cc
test/film_metadata_test.cc
test/format_test.cc
test/frame_rate_test.cc
test/job_test.cc
test/pixel_formats_test.cc
test/stream_test.cc
test/test.cc
wscript