[YoutubeDL] Try to download worst audio+video served by a single file first (Closes...
authorSergey M․ <dstftw@gmail.com>
Sun, 12 Apr 2015 11:36:29 +0000 (17:36 +0600)
committerSergey M․ <dstftw@gmail.com>
Sun, 12 Apr 2015 11:36:29 +0000 (17:36 +0600)
youtube_dl/YoutubeDL.py

index 640b8c99d75d6215b232c0d2d678dd903f41e8bb..a68b24ab485d6ef8e064ee7533a4a15379eb87cf 100755 (executable)
@@ -919,6 +919,11 @@ class YoutubeDL(object):
         if format_spec == 'best' or format_spec is None:
             return available_formats[-1]
         elif format_spec == 'worst':
+            audiovideo_formats = [
+                f for f in available_formats
+                if f.get('vcodec') != 'none' and f.get('acodec') != 'none']
+            if audiovideo_formats:
+                return audiovideo_formats[0]
             return available_formats[0]
         elif format_spec == 'bestaudio':
             audio_formats = [