From: Filippo Valsorda <filosottile.wiki@gmail.com>
Date: Sun, 3 Jun 2012 10:39:16 +0000 (-0700)
Subject: Merge pull request #353 from FiloSottile/avconv
X-Git-Tag: 2012.09.27~13
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=17f3c40a31e6667bb7b18cbe7cf24e5728d7aabd;p=youtube-dl.git

Merge pull request #353 from FiloSottile/avconv

check for avconv and ffmpeg, use as available; closes #344
---

17f3c40a31e6667bb7b18cbe7cf24e5728d7aabd