git.sesse.net Git - casparcg/commit

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

author	cambell <cambell.prince@gmail.com>
	Fri, 31 May 2013 02:01:53 +0000 (09:01 +0700)
committer	cambell <cambell.prince@gmail.com>
	Fri, 31 May 2013 02:01:53 +0000 (09:01 +0700)
commit	fbce4ecebbc910dfcec88568b18fd82d1ad95f0f
tree	5ba958f6fa18601725ed2e35a32c57f63db04f9c	tree \| snapshot
parent	a540c2296ee3bd20211cd838a6c121b1f03b8a65	commit \| diff

Rebase parameters branch on current master.

* Change parameters const& to const parameters& for coding style.
* Update thumbnail producer to use parameters class.
* Update some methods to use params.get(...) rather than get_params.

Conflicts:
core/core.vcxproj

43 files changed:

common/utility/param.h	[deleted file]	blob \| history
core/consumer/frame_consumer.cpp		diff \| blob \| history
core/consumer/frame_consumer.h		diff \| blob \| history
core/core.vcxproj		diff \| blob \| history
core/parameters/parameters.cpp	[new file with mode: 0644]	blob
core/parameters/parameters.h	[new file with mode: 0644]	blob
core/producer/color/color_producer.cpp		diff \| blob \| history
core/producer/color/color_producer.h		diff \| blob \| history
core/producer/frame_producer.cpp		diff \| blob \| history
core/producer/frame_producer.h		diff \| blob \| history
modules/bluefish/bluefish.cpp		diff \| blob \| history
modules/bluefish/consumer/bluefish_consumer.cpp		diff \| blob \| history
modules/bluefish/consumer/bluefish_consumer.h		diff \| blob \| history
modules/decklink/consumer/decklink_consumer.cpp		diff \| blob \| history
modules/decklink/consumer/decklink_consumer.h		diff \| blob \| history
modules/decklink/decklink.cpp		diff \| blob \| history
modules/decklink/producer/decklink_producer.cpp		diff \| blob \| history
modules/decklink/producer/decklink_producer.h		diff \| blob \| history
modules/ffmpeg/consumer/ffmpeg_consumer.cpp		diff \| blob \| history
modules/ffmpeg/consumer/ffmpeg_consumer.h		diff \| blob \| history
modules/ffmpeg/ffmpeg.cpp		diff \| blob \| history
modules/ffmpeg/producer/ffmpeg_producer.cpp		diff \| blob \| history
modules/ffmpeg/producer/ffmpeg_producer.h		diff \| blob \| history
modules/flash/producer/cg_producer.cpp		diff \| blob \| history
modules/flash/producer/cg_producer.h		diff \| blob \| history
modules/flash/producer/flash_producer.cpp		diff \| blob \| history
modules/flash/producer/flash_producer.h		diff \| blob \| history
modules/image/consumer/image_consumer.cpp		diff \| blob \| history
modules/image/consumer/image_consumer.h		diff \| blob \| history
modules/image/image.cpp		diff \| blob \| history
modules/image/producer/image_producer.cpp		diff \| blob \| history
modules/image/producer/image_producer.h		diff \| blob \| history
modules/image/producer/image_scroll_producer.cpp		diff \| blob \| history
modules/image/producer/image_scroll_producer.h		diff \| blob \| history
modules/oal/consumer/oal_consumer.cpp		diff \| blob \| history
modules/oal/consumer/oal_consumer.h		diff \| blob \| history
modules/oal/oal.cpp		diff \| blob \| history
modules/ogl/consumer/ogl_consumer.cpp		diff \| blob \| history
modules/ogl/consumer/ogl_consumer.h		diff \| blob \| history
modules/ogl/ogl.cpp		diff \| blob \| history
protocol/amcp/AMCPCommand.h		diff \| blob \| history
protocol/amcp/AMCPCommandsImpl.cpp		diff \| blob \| history
shell/server.cpp		diff \| blob \| history

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

RSS Atom