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

author	Carl Hetherington <cth@carlh.net>
	Sat, 4 May 2013 15:52:48 +0000 (16:52 +0100)
committer	Carl Hetherington <cth@carlh.net>
	Sat, 4 May 2013 15:52:48 +0000 (16:52 +0100)
commit	8a1042b767e2604b0af4850dd69fd6a848fd6ffe
tree	39560c1b93baad261de4324dced88b8e999ae371	tree \| snapshot
parent	cd4a82d90677cec80e891ac190000cb70767446f	commit \| diff

Add FFmpeg content dialog; moving ffmpeg-specific things out of the film editor.

src/lib/film.cc		diff \| blob \| history
src/lib/film.h		diff \| blob \| history
src/lib/playlist.cc		diff \| blob \| history
src/lib/playlist.h		diff \| blob \| history
src/wx/ffmpeg_content_dialog.cc	[new file with mode: 0644]	blob
src/wx/ffmpeg_content_dialog.h	[new file with mode: 0644]	blob
src/wx/film_editor.cc		diff \| blob \| history
src/wx/film_editor.h		diff \| blob \| history
src/wx/imagemagick_content_dialog.cc		diff \| blob \| history
src/wx/imagemagick_content_dialog.h		diff \| blob \| history
src/wx/wscript		diff \| blob \| history

2.0 development branch of dcpomatic