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)
commit35aa7098cd22249e3ab446925a27c57572ff49d9
tree961af62fc0af980d803a8b2ab4eb9af02f36ac2e
parent9d6192a5b8d81b2997fa7dc7bb1b2a3db0183a91
parent76b1bd672d56d4776f377a586a9b64145e089345
Merge remote-tracking branch 'origin/prefer-ffmpeg'