git.sesse.net Git - casparcg/commit

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

author	Helge Norberg <helge.norberg@svt.se>
	Fri, 25 Oct 2013 15:32:58 +0000 (17:32 +0200)
committer	Helge Norberg <helge.norberg@svt.se>
	Fri, 25 Oct 2013 15:32:58 +0000 (17:32 +0200)
commit	b0a6986ce56a18a56e67be266d6d253af7cdcbb5
tree	55d889452e5c92122037fcea802e45c067477b94	tree \| snapshot
parent	3d107888724a3b3dd1bbadcccd3ccfb3d94b3cb2	commit \| diff

Merged most recent OSC changes

58 files changed:

common/except.cpp		diff \| blob \| history
common/except.h		diff \| blob \| history
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/monitor/monitor.cpp		diff \| blob \| history
core/monitor/monitor.h		diff \| blob \| history
core/producer/color/color_producer.cpp		diff \| blob \| history
core/producer/draw/freehand_producer.cpp		diff \| blob \| history
core/producer/frame_producer.cpp		diff \| blob \| history
core/producer/frame_producer.h		diff \| blob \| history
core/producer/layer.cpp		diff \| blob \| history
core/producer/layer.h		diff \| blob \| history
core/producer/scene/const_producer.cpp		diff \| blob \| history
core/producer/scene/hotswap_producer.cpp		diff \| blob \| history
core/producer/scene/hotswap_producer.h		diff \| blob \| history
core/producer/scene/scene_producer.cpp		diff \| blob \| history
core/producer/scene/scene_producer.h		diff \| blob \| history
core/producer/separated/separated_producer.cpp		diff \| blob \| history
core/producer/stage.cpp		diff \| blob \| history
core/producer/stage.h		diff \| blob \| history
core/producer/text/text_producer.cpp		diff \| blob \| history
core/producer/text/text_producer.h		diff \| blob \| history
core/producer/transition/transition_producer.cpp		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/decklink/producer/decklink_producer.cpp		diff \| blob \| history
modules/ffmpeg/consumer/ffmpeg_consumer.cpp		diff \| blob \| history
modules/ffmpeg/producer/audio/audio_decoder.cpp		diff \| blob \| history
modules/ffmpeg/producer/audio/audio_decoder.h		diff \| blob \| history
modules/ffmpeg/producer/ffmpeg_producer.cpp		diff \| blob \| history
modules/ffmpeg/producer/video/video_decoder.cpp		diff \| blob \| history
modules/ffmpeg/producer/video/video_decoder.h		diff \| blob \| history
modules/flash/producer/cg_proxy.cpp		diff \| blob \| history
modules/flash/producer/cg_proxy.h		diff \| blob \| history
modules/flash/producer/flash_producer.cpp		diff \| blob \| history
modules/image/consumer/image_consumer.cpp		diff \| blob \| history
modules/image/producer/image_producer.cpp		diff \| blob \| history
modules/image/producer/image_scroll_producer.cpp		diff \| blob \| history
modules/oal/consumer/oal_consumer.cpp		diff \| blob \| history
modules/reroute/producer/reroute_producer.cpp		diff \| blob \| history
modules/screen/consumer/screen_consumer.cpp		diff \| blob \| history
protocol/asio/io_service_manager.cpp	[new file with mode: 0644]	blob
protocol/asio/io_service_manager.h	[new file with mode: 0644]	blob
protocol/osc/client.cpp	[new file with mode: 0644]	blob
protocol/osc/client.h	[new file with mode: 0644]	blob
protocol/osc/server.cpp	[deleted file]	blob \| history
protocol/osc/server.h	[deleted file]	blob \| history
protocol/protocol.vcxproj		diff \| blob \| history
protocol/protocol.vcxproj.filters		diff \| blob \| history
shell/casparcg.config		diff \| blob \| history
shell/server.cpp		diff \| blob \| history
shell/server.h		diff \| blob \| history

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

RSS Atom