Merge pull request #387 from taka-no-me:fix_dshow_fourcc_conversion
authorcuda-geek <marina.kolpakova@itseez.com>
Thu, 31 Jan 2013 09:26:25 +0000 (13:26 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Thu, 31 Jan 2013 09:26:26 +0000 (13:26 +0400)

Trivial merge