Merge pull request #410 from taka-no-me:fix_cap_dshow_setfps
authorAndrey Kamaev <andrey.kamaev@itseez.com>
Mon, 4 Feb 2013 07:57:32 +0000 (11:57 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Mon, 4 Feb 2013 07:57:33 +0000 (11:57 +0400)

Trivial merge