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

author	Carl Hetherington <cth@carlh.net>
	Fri, 22 Nov 2013 18:42:46 +0000 (18:42 +0000)
committer	Carl Hetherington <cth@carlh.net>
	Fri, 22 Nov 2013 18:42:46 +0000 (18:42 +0000)
commit	ef4cd174472dc1c4694d4451dc60b9292c60666b
tree	216d46bad240478d4dd9f289e0b542c2dc76dcbd	tree \| snapshot
parent	af474db6af17d468b42fbae8bd4c3e80dcfd0588	commit \| diff

Merge still/moving image classes.

31 files changed:

src/lib/content.cc		diff \| blob \| history
src/lib/content_factory.cc		diff \| blob \| history
src/lib/image_content.cc	[new file with mode: 0644]	blob
src/lib/image_content.h	[new file with mode: 0644]	blob
src/lib/image_decoder.cc	[new file with mode: 0644]	blob
src/lib/image_decoder.h	[new file with mode: 0644]	blob
src/lib/image_examiner.cc	[new file with mode: 0644]	blob
src/lib/image_examiner.h	[new file with mode: 0644]	blob
src/lib/moving_image.h	[deleted file]	blob \| history
src/lib/moving_image_content.cc	[deleted file]	blob \| history
src/lib/moving_image_content.h	[deleted file]	blob \| history
src/lib/moving_image_decoder.cc	[deleted file]	blob \| history
src/lib/moving_image_decoder.h	[deleted file]	blob \| history
src/lib/moving_image_examiner.cc	[deleted file]	blob \| history
src/lib/moving_image_examiner.h	[deleted file]	blob \| history
src/lib/player.cc		diff \| blob \| history
src/lib/playlist.cc		diff \| blob \| history
src/lib/still_image.h	[deleted file]	blob \| history
src/lib/still_image_content.cc	[deleted file]	blob \| history
src/lib/still_image_content.h	[deleted file]	blob \| history
src/lib/still_image_decoder.cc	[deleted file]	blob \| history
src/lib/still_image_decoder.h	[deleted file]	blob \| history
src/lib/still_image_examiner.cc	[deleted file]	blob \| history
src/lib/still_image_examiner.h	[deleted file]	blob \| history
src/lib/wscript		diff \| blob \| history
src/wx/content_menu.cc		diff \| blob \| history
src/wx/film_editor.cc		diff \| blob \| history
src/wx/film_viewer.cc		diff \| blob \| history
src/wx/timing_panel.cc		diff \| blob \| history
test/black_fill_test.cc		diff \| blob \| history
test/scaling_test.cc		diff \| blob \| history

2.0 development branch of dcpomatic

RSS Atom