git.sesse.net Git - casparcg/commit

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

author	Helge Norberg <helge.norberg@svt.se>
	Thu, 13 Aug 2015 17:53:02 +0000 (19:53 +0200)
committer	Helge Norberg <helge.norberg@svt.se>
	Thu, 13 Aug 2015 17:53:02 +0000 (19:53 +0200)
commit	c77152657f7864ca78a9638948272193e1a88faf
tree	d1f49d7df5b14250438b36eac21459d4842fbffe	tree \| snapshot
parent	36b3cca88192e4a866cbc3156a33ffe3b168a486	commit \| diff

Merged INFO DELAY from 2.0

28 files changed:

core/consumer/frame_consumer.cpp		diff \| blob \| history
core/consumer/frame_consumer.h		diff \| blob \| history
core/consumer/output.cpp		diff \| blob \| history
core/consumer/output.h		diff \| blob \| history
core/consumer/port.cpp		diff \| blob \| history
core/consumer/port.h		diff \| blob \| history
core/frame/draw_frame.cpp		diff \| blob \| history
core/frame/draw_frame.h		diff \| blob \| history
core/frame/frame.cpp		diff \| blob \| history
core/frame/frame.h		diff \| blob \| history
core/mixer/mixer.cpp		diff \| blob \| history
core/mixer/mixer.h		diff \| blob \| history
core/producer/layer.cpp		diff \| blob \| history
core/producer/layer.h		diff \| blob \| history
core/producer/stage.cpp		diff \| blob \| history
core/producer/stage.h		diff \| blob \| history
core/video_channel.cpp		diff \| blob \| history
core/video_channel.h		diff \| blob \| history
modules/bluefish/consumer/bluefish_consumer.cpp		diff \| blob \| history
modules/decklink/consumer/decklink_consumer.cpp		diff \| blob \| history
modules/ffmpeg/consumer/ffmpeg_consumer.cpp		diff \| blob \| history
modules/ffmpeg/consumer/streaming_consumer.cpp		diff \| blob \| history
modules/image/consumer/image_consumer.cpp		diff \| blob \| history
modules/newtek/consumer/newtek_ivga_consumer.cpp		diff \| blob \| history
modules/oal/consumer/oal_consumer.cpp		diff \| blob \| history
modules/reroute/producer/channel_producer.cpp		diff \| blob \| history
modules/screen/consumer/screen_consumer.cpp		diff \| blob \| history
protocol/amcp/AMCPCommandsImpl.cpp		diff \| blob \| history

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