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)
commit2c6818341f9e1dc28248d48dc9c121d1832d6a61
treee1f355251dde2a1f4b5fee5057995b6cd9a32c78
parent5d4867ab2f281c1ab0344e7418db8ee76cc83ec5
parent32eafba860e77479937c36db5b7c441208e0da8c
Merge pull request #968 from antonlacon/ffmpeg-2.5.x

ffmpeg: update to 2.5.4