main.carlh.net Git - dcpomatic.git/commit

author	Carl Hetherington <cth@carlh.net>
	Wed, 24 Oct 2012 17:14:10 +0000 (18:14 +0100)
committer	Carl Hetherington <cth@carlh.net>
	Wed, 24 Oct 2012 17:14:10 +0000 (18:14 +0100)
commit	bd8fa9a370f1739952c83107352baa08c79d095e
tree	dafa3dae2db5439dc08e770fc4b09febac5f0374	tree \| snapshot
parent	44b57d623dec97a3f9955082f0b8a7a8d27b7518	commit \| diff

Merge FilmState / Film.

58 files changed:

src/lib/ab_transcode_job.cc		diff \| blob \| history
src/lib/ab_transcode_job.h		diff \| blob \| history
src/lib/ab_transcoder.cc		diff \| blob \| history
src/lib/ab_transcoder.h		diff \| blob \| history
src/lib/check_hashes_job.cc		diff \| blob \| history
src/lib/check_hashes_job.h		diff \| blob \| history
src/lib/copy_from_dvd_job.cc		diff \| blob \| history
src/lib/copy_from_dvd_job.h		diff \| blob \| history
src/lib/dcp_content_type.h		diff \| blob \| history
src/lib/dcp_video_frame.cc		diff \| blob \| history
src/lib/decoder.cc		diff \| blob \| history
src/lib/decoder.h		diff \| blob \| history
src/lib/decoder_factory.cc		diff \| blob \| history
src/lib/decoder_factory.h		diff \| blob \| history
src/lib/encoder.cc		diff \| blob \| history
src/lib/encoder.h		diff \| blob \| history
src/lib/encoder_factory.cc		diff \| blob \| history
src/lib/encoder_factory.h		diff \| blob \| history
src/lib/examine_content_job.cc		diff \| blob \| history
src/lib/examine_content_job.h		diff \| blob \| history
src/lib/ffmpeg_decoder.cc		diff \| blob \| history
src/lib/ffmpeg_decoder.h		diff \| blob \| history
src/lib/film.cc		diff \| blob \| history
src/lib/film.h		diff \| blob \| history
src/lib/film_state.cc	[deleted file]	blob \| history
src/lib/film_state.h	[deleted file]	blob \| history
src/lib/imagemagick_decoder.cc		diff \| blob \| history
src/lib/imagemagick_decoder.h		diff \| blob \| history
src/lib/imagemagick_encoder.cc		diff \| blob \| history
src/lib/imagemagick_encoder.h		diff \| blob \| history
src/lib/j2k_still_encoder.cc		diff \| blob \| history
src/lib/j2k_still_encoder.h		diff \| blob \| history
src/lib/j2k_wav_encoder.cc		diff \| blob \| history
src/lib/j2k_wav_encoder.h		diff \| blob \| history
src/lib/job.cc		diff \| blob \| history
src/lib/job.h		diff \| blob \| history
src/lib/make_dcp_job.cc		diff \| blob \| history
src/lib/make_dcp_job.h		diff \| blob \| history
src/lib/player.cc		diff \| blob \| history
src/lib/player_manager.cc		diff \| blob \| history
src/lib/scp_dcp_job.cc		diff \| blob \| history
src/lib/scp_dcp_job.h		diff \| blob \| history
src/lib/subtitle.cc		diff \| blob \| history
src/lib/tiff_decoder.cc		diff \| blob \| history
src/lib/tiff_decoder.h		diff \| blob \| history
src/lib/transcode_job.cc		diff \| blob \| history
src/lib/transcode_job.h		diff \| blob \| history
src/lib/transcoder.cc		diff \| blob \| history
src/lib/transcoder.h		diff \| blob \| history
src/lib/util.cc		diff \| blob \| history
src/lib/util.h		diff \| blob \| history
src/lib/wscript		diff \| blob \| history
src/wx/film_editor.cc		diff \| blob \| history
src/wx/film_editor.h		diff \| blob \| history
src/wx/film_player.cc		diff \| blob \| history
src/wx/film_viewer.cc		diff \| blob \| history
src/wx/film_viewer.h		diff \| blob \| history
test/test.cc		diff \| blob \| history

2.0 development branch of dcpomatic

RSS Atom