Merge pull request #11358 from mshabunin:enable-xine
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Mon, 23 Apr 2018 10:09:29 +0000 (10:09 +0000)
committerVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Mon, 23 Apr 2018 10:09:29 +0000 (10:09 +0000)
1  2 
modules/videoio/src/cap.cpp

Simple merge