Merge pull request #3446 from pokeefe:fix-compilation-without-videoio
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Mon, 1 Dec 2014 10:41:34 +0000 (10:41 +0000)
committerVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Mon, 1 Dec 2014 10:41:35 +0000 (10:41 +0000)
commitd368a7ceb4fcabe0c8cd7d7a1c33f5d9ebc6340b
tree2114eb23c44f1251b279a4cc1c43f19a6dadd532
parent2f4c11b5e5a5261bc617eea58ac2e0e05c5c1f51
parent6d78cfc0d9efff366e6a80ee9758cfc5ef4335fb
Merge pull request #3446 from pokeefe:fix-compilation-without-videoio