Merge pull request #195 from antonlacon/ffmpeg-2.3.x
authorTed Hess <redacted>
Tue, 12 Aug 2014 21:19:48 +0000 (17:19 -0400)
committerTed Hess <redacted>
Tue, 12 Aug 2014 21:19:48 +0000 (17:19 -0400)
ffmpeg: Update to 2.3.1 and other cleanup


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