Merge pull request #2207 from antonlacon/ffmpeg-2.7.x
authorTed Hess <redacted>
Wed, 30 Dec 2015 18:25:00 +0000 (13:25 -0500)
committerTed Hess <redacted>
Wed, 30 Dec 2015 18:25:00 +0000 (13:25 -0500)
ffmpeg: update to 2.7.4


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