]> git.sesse.net Git - casparcg/commit
2.0.0.2: Merged mixer into core/mixer.
authorronag <ronag@362d55ac-95cf-4e76-9f9a-cbaa9c17b72d>
Thu, 28 Apr 2011 13:43:58 +0000 (13:43 +0000)
committerronag <ronag@362d55ac-95cf-4e76-9f9a-cbaa9c17b72d>
Thu, 28 Apr 2011 13:43:58 +0000 (13:43 +0000)
commitba4563b293f7107519bf116cc28abfc9768bb49b
tree436e553f2b615ca88ee1723671bd637bb20c4670
parenta69a0ec7d724b5ba25c12b44055e3a3f1ecc0072
2.0.0.2: Merged mixer into core/mixer.

git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/branches/2.0.0.2@663 362d55ac-95cf-4e76-9f9a-cbaa9c17b72d
25 files changed:
casparcg.sln
core/core.vcxproj
core/core.vcxproj.filters
core/mixer/audio/audio_mixer.cpp [new file with mode: 0644]
core/mixer/audio/audio_mixer.h [new file with mode: 0644]
core/mixer/frame_mixer_device.cpp [new file with mode: 0644]
core/mixer/frame_mixer_device.h [new file with mode: 0644]
core/mixer/gpu/device_buffer.cpp [new file with mode: 0644]
core/mixer/gpu/device_buffer.h [new file with mode: 0644]
core/mixer/gpu/gpu_read_frame.cpp [new file with mode: 0644]
core/mixer/gpu/gpu_read_frame.h [new file with mode: 0644]
core/mixer/gpu/gpu_write_frame.cpp [new file with mode: 0644]
core/mixer/gpu/gpu_write_frame.h [new file with mode: 0644]
core/mixer/gpu/host_buffer.cpp [new file with mode: 0644]
core/mixer/gpu/host_buffer.h [new file with mode: 0644]
core/mixer/gpu/ogl_device.cpp [new file with mode: 0644]
core/mixer/gpu/ogl_device.h [new file with mode: 0644]
core/mixer/image/image_kernel.cpp [new file with mode: 0644]
core/mixer/image/image_kernel.h [new file with mode: 0644]
core/mixer/image/image_mixer.cpp [new file with mode: 0644]
core/mixer/image/image_mixer.h [new file with mode: 0644]
modules/ffmpeg/producer/video/video_decoder.h
protocol/protocol.vcxproj
shell/main.cpp
shell/shell.vcxproj