Merge pull request #7181 from valeriyvan:ioscleanup

author Alexander Alekhin <alexander.a.alekhin@gmail.com>

Wed, 14 Sep 2016 17:04:59 +0000 (17:04 +0000)

committer Alexander Alekhin <alexander.a.alekhin@gmail.com>

Wed, 14 Sep 2016 17:04:59 +0000 (17:04 +0000)
author Alexander Alekhin <alexander.a.alekhin@gmail.com>
Wed, 14 Sep 2016 17:04:59 +0000 (17:04 +0000)
committer Alexander Alekhin <alexander.a.alekhin@gmail.com>
Wed, 14 Sep 2016 17:04:59 +0000 (17:04 +0000)
diff --cc modules/videoio/include/opencv2/videoio/cap_ios.h
Simple merge
diff --cc modules/videoio/src/cap_ios_video_camera.mm
Simple merge
author	Alexander Alekhin <alexander.a.alekhin@gmail.com>
	Wed, 14 Sep 2016 17:04:59 +0000 (17:04 +0000)
committer	Alexander Alekhin <alexander.a.alekhin@gmail.com>
	Wed, 14 Sep 2016 17:04:59 +0000 (17:04 +0000)
		1	2
modules/videoio/include/opencv2/videoio/cap_ios.h	patch \|	diff1 \|	diff2 \|	blob \| history
modules/videoio/src/cap_ios_video_camera.mm	patch \|	diff1 \|	diff2 \|	blob \| history