]> git.sesse.net Git - casparcg/commit
2.1.0: Merged trunk.
authorronag <ronag@362d55ac-95cf-4e76-9f9a-cbaa9c17b72d>
Fri, 23 Dec 2011 20:26:27 +0000 (20:26 +0000)
committerronag <ronag@362d55ac-95cf-4e76-9f9a-cbaa9c17b72d>
Fri, 23 Dec 2011 20:26:27 +0000 (20:26 +0000)
commit29ace981d0432490f00f148823ae89f781d20424
tree3f89ba21f1c1326219c6ae6094b76371d7aa34bd
parent3cab6771476706f8a02ba208d7a5c638315e0cf3
2.1.0: Merged trunk.

r1937
Pretty printing.
---------------------
r1936
Pretty printing.
---------------------
r1935
More pretty printing.
---------------------
r1934
More nice printing.
---------------------
r1933
Nicer printing.
---------------------
r1932
executor: Throw on begin_invoke while stopped.
---------------------
r1931

---------------------
r1930

---------------------
r1929
Catch CG command exceptions.
---------------------
r1928
Lock helper now returns value.
---------------------
r1927

---------------------
r1926
Less verbose logging.
---------------------
r1925
graph: Minor improvements. frame_producer: print init and uninit. ffmpeg/input: Use executor instead of explicit thread and cond-var.
---------------------
r1924
Fixed graph memory-leak.
---------------------
r1923
frame_muxer: Use optimal NTSC cadence.
---------------------
r1922

---------------------
r1921

---------------------
r1920

---------------------
r1919
- ogl_consumer: Fixed params for create. - Added channel-grid functionality.
---------------------
r1918
Added channel-grid.
---------------------
r1917

---------------------
r1916

---------------------
r1915

---------------------
r1914

---------------------
r1913
flash_producer: Throw file_not found in creation thread.
---------------------
r1912
Fixed CII encoding.
---------------------
r1911
Fixed wierd include.
---------------------

git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/branches/2.1.0@1938 362d55ac-95cf-4e76-9f9a-cbaa9c17b72d
44 files changed:
common/common.vcxproj
common/common.vcxproj.filters
common/concurrency/executor.h
common/concurrency/lock.h [new file with mode: 0644]
common/diagnostics/graph.cpp
common/log/log.cpp
core/consumer/output.cpp
core/consumer/output.h
core/core.vcxproj
core/core.vcxproj.filters
core/mixer/gpu/ogl_device.cpp
core/mixer/gpu/ogl_device.h
core/mixer/mixer.cpp
core/producer/channel/channel_producer.cpp [new file with mode: 0644]
core/producer/channel/channel_producer.h [new file with mode: 0644]
core/producer/frame_producer.cpp
core/producer/frame_producer.h
core/video_channel.cpp
core/video_channel.h
modules/decklink/producer/decklink_producer.cpp
modules/ffmpeg/consumer/ffmpeg_consumer.cpp
modules/ffmpeg/ffmpeg.cpp
modules/ffmpeg/producer/audio/audio_decoder.cpp
modules/ffmpeg/producer/audio/audio_decoder.h
modules/ffmpeg/producer/audio/audio_resampler.cpp
modules/ffmpeg/producer/ffmpeg_producer.cpp
modules/ffmpeg/producer/input/input.cpp
modules/ffmpeg/producer/muxer/frame_muxer.cpp
modules/ffmpeg/producer/video/video_decoder.cpp
modules/ffmpeg/producer/video/video_decoder.h
modules/flash/producer/FlashAxContainer.cpp
modules/flash/producer/cg_producer.cpp
modules/flash/producer/flash_producer.cpp
modules/image/producer/image_producer.cpp
modules/ogl/consumer/ogl_consumer.cpp
protocol/amcp/AMCPCommandsImpl.cpp
protocol/amcp/AMCPCommandsImpl.h
protocol/amcp/AMCPProtocolStrategy.cpp
protocol/cii/CIICommandsImpl.cpp
protocol/cii/CIIProtocolStrategy.cpp
protocol/util/AsyncEventServer.cpp
protocol/util/ClientInfo.h
shell/casparcg.config
shell/server.cpp