From 00447175b9987181aa5aca51542e61df2f8b9d2d Mon Sep 17 00:00:00 2001 From: Ryan Jacobs Date: Wed, 3 Sep 2014 16:10:49 -0700 Subject: [PATCH] Add format mixing info. --- README.md | 5 +++-- youtube_dl/__init__.py | 1 - 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index cabc5eb9a..f180e357f 100644 --- a/README.md +++ b/README.md @@ -231,8 +231,9 @@ which means you can modify it, redistribute it or use it however you like. mp4 , -f m4a and -f flv are also supported. You can also use the special names "best", "bestvideo", "bestaudio", - "worst", "worstvideo" and "worstaudio". By - default, youtube-dl will pick the best + "worst", "worstvideo" and "worstaudio". + Use a plus sign to mix formats: -f 22+140 + By default, youtube-dl will pick the best quality. Use commas to download multiple audio formats, such as -f 136/137/mp4/bestvideo,140/m4a/bestaudio diff --git a/youtube_dl/__init__.py b/youtube_dl/__init__.py index 7f2b4dfcc..848725a66 100644 --- a/youtube_dl/__init__.py +++ b/youtube_dl/__init__.py @@ -125,7 +125,6 @@ from .postprocessor import ( ExecAfterDownloadPP, ) - def _real_main(argv=None): # Compatibility fixes for Windows if sys.platform == 'win32':