Merge pull request #261 from antonlacon/ffmpeg-2.3.x
authorTed Hess <thess@kitschensync.net>
Sat, 30 Aug 2014 12:40:33 +0000 (08:40 -0400)
committerTed Hess <thess@kitschensync.net>
Sat, 30 Aug 2014 12:40:33 +0000 (08:40 -0400)
ffmpeg: update to 2.3.3


Trivial merge