Merge pull request #5361 from alalek:update_ffmpeg_support
authorAlexander Alekhin <alexander.alekhin@itseez.com>
Mon, 21 Sep 2015 10:48:41 +0000 (10:48 +0000)
committerAlexander Alekhin <alexander.alekhin@itseez.com>
Mon, 21 Sep 2015 10:48:42 +0000 (10:48 +0000)
commit108bb7543070ebe4a1dc5602e7654393cd49576b
tree5cf8992a48380b83d795cc14e2480ab34feae2d4
parent4613d37ebaf8b183f5636b67c783cee6f6e0bade
parentf88e9a748a37e5df00912524e590fb295e7dab70
Merge pull request #5361 from alalek:update_ffmpeg_support