Merge pull request #3006 from thess/ffmpeg-updates
authorTed Hess <thess@kitschensync.net>
Wed, 3 Aug 2016 15:56:10 +0000 (11:56 -0400)
committerGitHub <noreply@github.com>
Wed, 3 Aug 2016 15:56:10 +0000 (11:56 -0400)
commitbf1216ca2d9a3f9e235e7125c9d11c17689c1898
treee854354051105e37879ca900a7a1075b6388e171
parentbc52c0eaaefb139abb941f358ed2cf5a24c94dc0
parent3f124e2b8eeb6c7e14819739d7d49d0e7550e59c
Merge pull request #3006 from thess/ffmpeg-updates

ffmpeg: Update to 2.8.7. Add support for x264 and libmp3lame