Merge pull request #12405 from todortomov:3.4_cap_v4l_query_conrtols
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Tue, 4 Sep 2018 12:55:05 +0000 (12:55 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Tue, 4 Sep 2018 12:55:05 +0000 (12:55 +0000)

Trivial merge