From 76b1bd672d56d4776f377a586a9b64145e089345 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaime=20Marqui=CC=81nez=20Ferra=CC=81ndiz?= Date: Wed, 8 Jan 2014 17:53:34 +0100 Subject: =?UTF-8?q?Add=20=E2=80=98--prefer-avconv=E2=80=99=20and=20?= =?UTF-8?q?=E2=80=98--prefer-ffmpeg=E2=80=99=20options=20(#2115)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Affects the ffmpeg post processors, if ‘--prefer-ffmpeg’ is given and both avconv and ffmpeg are installed, it will use ffmpeg. Otherwise it will follow the old behaviour. --- youtube_dl/YoutubeDL.py | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'youtube_dl/YoutubeDL.py') 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 -- cgit v1.2.3