Merge master; specify libdcp-1.0.
authorCarl Hetherington <cth@carlh.net>
Mon, 24 Feb 2014 12:19:50 +0000 (12:19 +0000)
committerCarl Hetherington <cth@carlh.net>
Mon, 24 Feb 2014 12:19:50 +0000 (12:19 +0000)
commit85c65bd422742813992686c17a5e1b718cc3c449
tree21750399bcb19e1fb6242bba7595773513a80912
parente2be8234013335379bd49a53854218039348c7a4
parenteed40e4e5ca46bbc31a9833d2b766c96c11b0254
Merge master; specify libdcp-1.0.
20 files changed:
cscript
src/lib/analyse_audio_job.cc
src/lib/analyse_audio_job.h
src/lib/content.cc
src/lib/content.h
src/lib/ffmpeg_content.cc
src/lib/ffmpeg_content.h
src/lib/ffmpeg_decoder.cc
src/lib/ffmpeg_examiner.cc
src/lib/ffmpeg_examiner.h
src/lib/film.cc
src/lib/film.h
src/lib/job.cc
src/lib/transcode_job.cc
src/lib/util.cc
src/lib/util.h
src/lib/wscript
src/wx/audio_mapping_view.cc
test/stream_test.cc
wscript