Merge pull request #968 from antonlacon/ffmpeg-2.5.x
authorTed Hess <thess@kitschensync.net>
Sun, 1 Mar 2015 14:24:58 +0000 (09:24 -0500)
committerTed Hess <thess@kitschensync.net>
Sun, 1 Mar 2015 14:24:58 +0000 (09:24 -0500)
ffmpeg: update to 2.5.4


Trivial merge