Merge pull request #3006 from thess/ffmpeg-updates
authorTed Hess <redacted>
Wed, 3 Aug 2016 15:56:10 +0000 (11:56 -0400)
committerGitHub <redacted>
Wed, 3 Aug 2016 15:56:10 +0000 (11:56 -0400)
ffmpeg: Update to 2.8.7. Add support for x264 and libmp3lame


Trivial merge
git clone https://git.99rst.org/PROJECT