Merge pull request #7771 from alalek:ffmpeg_update
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Thu, 8 Dec 2016 15:22:00 +0000 (15:22 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Thu, 8 Dec 2016 15:22:00 +0000 (15:22 +0000)
commit5cc2d7ad7cc97177de6e4c0ce4570ac0ab48c544
tree9fa0a5b71fb3f1c743a879ddeb4b2f00ef9b5a63
parent036dd8d48f68edd8fe229e9d2a91de255e7b4c29
parent39ca6a013765d8b86d1a76225dd3b3b2222602f0
Merge pull request #7771 from alalek:ffmpeg_update