git.sesse.net Git - casparcg/commit

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

author	Helge Norberg <helge.norberg@svt.se>
	Fri, 27 Mar 2015 14:02:48 +0000 (15:02 +0100)
committer	Helge Norberg <helge.norberg@svt.se>
	Fri, 27 Mar 2015 14:02:48 +0000 (15:02 +0100)
commit	15b3dad6661649f53562bcea673ba62e605d2b0a
tree	afd9f26c03558ec70b7b67078bc524223aa82c29	tree \| snapshot
parent	21bfeb8f33d950df1f931c88dc4d512b63babab6	commit \| diff

Merged ffmpeg duration column and media_info_repository in CLS and CINF from master, and abstracted CLIP_TYPE as well, so that the CLS command does not need to know about media types.

22 files changed:

core/CMakeLists.txt		diff \| blob \| history
core/producer/media_info/in_memory_media_info_repository.cpp	[new file with mode: 0644]	blob
core/producer/media_info/in_memory_media_info_repository.h	[new file with mode: 0644]	blob
core/producer/media_info/media_info.h	[new file with mode: 0644]	blob
core/producer/media_info/media_info_repository.h	[new file with mode: 0644]	blob
core/thumbnail_generator.cpp		diff \| blob \| history
core/thumbnail_generator.h		diff \| blob \| history
modules/ffmpeg/ffmpeg.cpp		diff \| blob \| history
modules/ffmpeg/ffmpeg.h		diff \| blob \| history
modules/ffmpeg/producer/util/util.cpp		diff \| blob \| history
modules/ffmpeg/producer/util/util.h		diff \| blob \| history
modules/flash/flash.cpp		diff \| blob \| history
modules/flash/flash.h		diff \| blob \| history
modules/image/image.cpp		diff \| blob \| history
modules/image/image.h		diff \| blob \| history
protocol/amcp/AMCPCommandsImpl.cpp		diff \| blob \| history
protocol/amcp/AMCPCommandsImpl.h		diff \| blob \| history
protocol/amcp/AMCPProtocolStrategy.cpp		diff \| blob \| history
protocol/amcp/AMCPProtocolStrategy.h		diff \| blob \| history
shell/main.cpp		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