Merge pull request #9892 from terfendail:v4l_custom
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Fri, 27 Oct 2017 11:57:18 +0000 (11:57 +0000)
committerVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Fri, 27 Oct 2017 11:57:18 +0000 (11:57 +0000)

Trivial merge