Merge remote-tracking branch 'upstream/master'

author Prof. Dr. Rudolf Haussmann <rudolf.haussmann@gmx.de>

Sat, 7 Mar 2015 12:10:41 +0000 (13:10 +0100)

committer Prof. Dr. Rudolf Haussmann <rudolf.haussmann@gmx.de>

Sat, 7 Mar 2015 12:10:41 +0000 (13:10 +0100)
author Prof. Dr. Rudolf Haussmann <rudolf.haussmann@gmx.de>
Sat, 7 Mar 2015 12:10:41 +0000 (13:10 +0100)
committer Prof. Dr. Rudolf Haussmann <rudolf.haussmann@gmx.de>
Sat, 7 Mar 2015 12:10:41 +0000 (13:10 +0100)
diff --cc modules/videoio/include/opencv2/videoio.hpp
Simple merge
diff --cc modules/videoio/include/opencv2/videoio/videoio_c.h
Simple merge
author	Prof. Dr. Rudolf Haussmann <rudolf.haussmann@gmx.de>
	Sat, 7 Mar 2015 12:10:41 +0000 (13:10 +0100)
committer	Prof. Dr. Rudolf Haussmann <rudolf.haussmann@gmx.de>
	Sat, 7 Mar 2015 12:10:41 +0000 (13:10 +0100)
		1	2
modules/videoio/include/opencv2/videoio.hpp	patch \|	diff1 \|	diff2 \|	blob \| history
modules/videoio/include/opencv2/videoio/videoio_c.h	patch \|	diff1 \|	diff2 \|	blob \| history