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)
commita68ce7eaf72e5485b9aba9258ed9cf8762c18913
treec18cae41b0c1049693aca50c37f6a6a04a70964e
parente632f4852d50aa0a248940198dc7e1ecf8c9d73c
parent733ce321dee4b72a918d33e4c17efc44238d5fb3
Merge pull request #1136 from antonlacon/ffmpeg-2.5.x

ffmpeg: upgrade to 2.5.5