Merge pull request #6743 from thess/ffmpeg-update
authorTed Hess <[email protected]>
Sun, 12 Aug 2018 23:55:39 +0000 (19:55 -0400)
committerGitHub <[email protected]>
Sun, 12 Aug 2018 23:55:39 +0000 (19:55 -0400)
ffmpeg: Add cpu_type to configure opts. Upgrade to 3.2.12


Trivial merge