From: Philipp Hagemeister Date: Wed, 8 Jan 2014 17:32:06 +0000 (+0100) Subject: Merge remote-tracking branch 'origin/prefer-ffmpeg' X-Git-Url: http://git.oshgnacknak.de/?a=commitdiff_plain;h=35aa7098cd22249e3ab446925a27c57572ff49d9;p=youtube-dl Merge remote-tracking branch 'origin/prefer-ffmpeg' --- 35aa7098cd22249e3ab446925a27c57572ff49d9