Merge pull request #4392 from antonlacon/ffmpeg-3.2.x
authorTed Hess <thess@kitschensync.net>
Sat, 27 May 2017 20:03:30 +0000 (16:03 -0400)
committerGitHub <noreply@github.com>
Sat, 27 May 2017 20:03:30 +0000 (16:03 -0400)
ffmpeg: update to 3.2.5


Trivial merge