Merge pull request #4005 from FernetMenta/ffmpeg
authorTrent Nelson <trent.a.b.nelson@gmail.com>
Sat, 1 Feb 2014 18:14:43 +0000 (10:14 -0800)
committerTrent Nelson <trent.a.b.nelson@gmail.com>
Sat, 1 Feb 2014 18:14:43 +0000 (10:14 -0800)
linux: link ffmpeg statically


Trivial merge