Merge pull request #10909 from alalek:ffmpeg_update
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Thu, 22 Feb 2018 14:05:37 +0000 (14:05 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Thu, 22 Feb 2018 14:05:37 +0000 (14:05 +0000)
commite851a41d78bce0b49fcf04b4f2e20c48a7281866
tree19f5297f8f7f2f30c606007ca540b405bad6368d
parent5e0f95b94890f146d81d9ff7b4c86d2b403d61cd
parentf7aa2e0d4477e2e95e9f891bb5be25411b711b4a
Merge pull request #10909 from alalek:ffmpeg_update