Merge pull request #696 from antonlacon/ffmpeg-2.4.x
authorTed Hess <thess@kitschensync.net>
Fri, 26 Dec 2014 14:43:44 +0000 (09:43 -0500)
committerTed Hess <thess@kitschensync.net>
Fri, 26 Dec 2014 14:43:44 +0000 (09:43 -0500)
ffmpeg: update to 2.4.5


Trivial merge