Merge remote-tracking branch 'origin/prefer-ffmpeg'
authorPhilipp Hagemeister <phihag@phihag.de>
Wed, 8 Jan 2014 17:32:06 +0000 (18:32 +0100)
committerPhilipp Hagemeister <phihag@phihag.de>
Wed, 8 Jan 2014 17:32:06 +0000 (18:32 +0100)

Trivial merge