From: Ted Hess <redacted>
Date: Sat, 11 Apr 2015 17:29:12 +0000 (-0400)
Subject: Merge pull request #1136 from antonlacon/ffmpeg-2.5.x
X-Git-Url: http://git.99rst.org/?a=commitdiff_plain;h=a68ce7eaf72e5485b9aba9258ed9cf8762c18913;p=openwrt-packages.git

Merge pull request #1136 from antonlacon/ffmpeg-2.5.x

ffmpeg: upgrade to 2.5.5
---

a68ce7eaf72e5485b9aba9258ed9cf8762c18913