diff options
author | Philipp Hagemeister <phihag@phihag.de> | 2014-01-08 18:32:06 +0100 |
---|---|---|
committer | Philipp Hagemeister <phihag@phihag.de> | 2014-01-08 18:32:06 +0100 |
commit | 35aa7098cd22249e3ab446925a27c57572ff49d9 (patch) | |
tree | 961af62fc0af980d803a8b2ab4eb9af02f36ac2e /youtube_dl/YoutubeDL.py | |
parent | 9d6192a5b8d81b2997fa7dc7bb1b2a3db0183a91 (diff) | |
parent | 76b1bd672d56d4776f377a586a9b64145e089345 (diff) |
Merge remote-tracking branch 'origin/prefer-ffmpeg'
Diffstat (limited to 'youtube_dl/YoutubeDL.py')
-rw-r--r-- | youtube_dl/YoutubeDL.py | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/youtube_dl/YoutubeDL.py b/youtube_dl/YoutubeDL.py index 6b1962850..d40314ee5 100644 --- a/youtube_dl/YoutubeDL.py +++ b/youtube_dl/YoutubeDL.py @@ -156,6 +156,10 @@ class YoutubeDL(object): the FileDownloader: nopart, updatetime, buffersize, ratelimit, min_filesize, max_filesize, test, noresizebuffer, retries, continuedl, noprogress, consoletitle + + The following options are used by the post processors: + prefer_ffmpeg: If True, use ffmpeg instead of avconv if both are available, + otherwise prefer avconv. """ params = None |