git.sesse.net Git - casparcg/commit

]> git.sesse.net Git - casparcg/commit

author	ronag <ronag@362d55ac-95cf-4e76-9f9a-cbaa9c17b72d>
	Wed, 7 Dec 2011 23:57:04 +0000 (23:57 +0000)
committer	ronag <ronag@362d55ac-95cf-4e76-9f9a-cbaa9c17b72d>
	Wed, 7 Dec 2011 23:57:04 +0000 (23:57 +0000)
commit	d98d80dc88909e119972626cb522495401612672
tree	e5f14e3a3ff57447d278c25f9f0a486ab563e49b	tree \| snapshot
parent	80a06de4353d285becc4a506f866cdafa4d98054	commit \| diff

2.1.0: Merged changes from trunk.

git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/branches/2.1.0@1840 362d55ac-95cf-4e76-9f9a-cbaa9c17b72d

14 files changed:

README.txt		diff \| blob \| history
core/consumer/frame_consumer.cpp		diff \| blob \| history
core/consumer/output.cpp		diff \| blob \| history
core/mixer/audio/audio_mixer.cpp		diff \| blob \| history
core/producer/separated/separated_producer.cpp		diff \| blob \| history
core/producer/transition/transition_producer.cpp		diff \| blob \| history
modules/decklink/interop/DeckLinkAPI_h.h	[deleted file]	blob \| history
modules/decklink/interop/DeckLinkAPI_i.c	[deleted file]	blob \| history
modules/decklink/producer/decklink_producer.cpp		diff \| blob \| history
modules/ffmpeg/producer/ffmpeg_producer.cpp		diff \| blob \| history
modules/ffmpeg/producer/muxer/frame_muxer.cpp		diff \| blob \| history
modules/ffmpeg/producer/muxer/frame_muxer.h		diff \| blob \| history
shell/casparcg.config		diff \| blob \| history
shell/main.cpp		diff \| blob \| history

Unnamed repository; edit this file 'description' to name the repository.

RSS Atom