From: Sergey M․ <dstftw@gmail.com>
Date: Fri, 15 Jul 2016 18:18:05 +0000 (+0700)
Subject: [YoutubeDL] Fix incomplete formats check
X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=2e221ca3a85ec7a0c441dfcf301bf1c98614b9dd;p=youtube-dl

[YoutubeDL] Fix incomplete formats check
---

diff --git a/youtube_dl/YoutubeDL.py b/youtube_dl/YoutubeDL.py
index cf9cd8297..6551f086f 100755
--- a/youtube_dl/YoutubeDL.py
+++ b/youtube_dl/YoutubeDL.py
@@ -1396,12 +1396,11 @@ class YoutubeDL(object):
         # instead of just formats.
         # This fixes incorrect format selection issue (see
         # https://github.com/rg3/youtube-dl/issues/10083).
-        incomplete_formats = all(
+        incomplete_formats = (
             # All formats are video-only or
-            f.get('vcodec') != 'none' and f.get('acodec') == 'none' or
+            all(f.get('vcodec') != 'none' and f.get('acodec') == 'none' for f in formats) or
             # all formats are audio-only
-            f.get('vcodec') == 'none' and f.get('acodec') != 'none'
-            for f in formats)
+            all(f.get('vcodec') == 'none' and f.get('acodec') != 'none' for f in formats))
 
         ctx = {
             'formats': formats,