Merge pull request #8602 from alalek:ffmpeg_update
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Wed, 3 May 2017 13:01:55 +0000 (13:01 +0000)
committerVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Wed, 3 May 2017 13:01:55 +0000 (13:01 +0000)
commit5950431e731e05e605e14d390f9bc0515b05c38a
tree8e4b186f100aa48d2fef3bfd8463ba9aab9f861f
parent05387b3921264c0cdf5914e8d06e254a78de8766
parenta8a1838615830ab9d1db8d79be4474322731fb24
Merge pull request #8602 from alalek:ffmpeg_update