Merge pull request #1136 from antonlacon/ffmpeg-2.5.x
authorTed Hess <thess@kitschensync.net>
Sat, 11 Apr 2015 17:29:12 +0000 (13:29 -0400)
committerTed Hess <thess@kitschensync.net>
Sat, 11 Apr 2015 17:29:12 +0000 (13:29 -0400)
ffmpeg: upgrade to 2.5.5


Trivial merge