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


Trivial merge