Merge pull request #1217 from wongsyrone/patch-1
authorTed Hess <redacted>
Thu, 30 Apr 2015 13:20:31 +0000 (09:20 -0400)
committerTed Hess <redacted>
Thu, 30 Apr 2015 13:20:31 +0000 (09:20 -0400)
ffmpeg: upgrade to 2.6.2


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