Various joining fixes.
authorCarl Hetherington <cth@carlh.net>
Sun, 24 Nov 2013 01:52:23 +0000 (01:52 +0000)
committerCarl Hetherington <cth@carlh.net>
Sun, 24 Nov 2013 01:52:23 +0000 (01:52 +0000)
commit8bef34f672815c3c9b4236d06fdee8dfd0bffbc2
treed37c47bf3ccb308f7a2959be0c2ef9c0e7ec9575
parentc3da7c64f01420447dbab7f5c2ea42ff1b911cc5
Various joining fixes.
22 files changed:
src/lib/content.cc
src/lib/content_factory.cc
src/lib/content_factory.h
src/lib/ffmpeg.cc
src/lib/ffmpeg.h
src/lib/ffmpeg_content.cc
src/lib/ffmpeg_content.h
src/lib/ffmpeg_decoder.cc
src/lib/ffmpeg_examiner.cc
src/lib/film.cc
src/lib/image_content.cc
src/lib/image_content.h
src/lib/playlist.cc
src/lib/playlist.h
src/lib/sndfile_content.cc
src/lib/sndfile_content.h
src/lib/util.cc
src/lib/video_content.cc
src/tools/dcpomatic.cc
src/wx/film_editor.cc
src/wx/hints_dialog.cc
test/stream_test.cc