diff options
| -rwxr-xr-x | youtube_dl/YoutubeDL.py | 7 | ||||
| -rw-r--r-- | youtube_dl/extractor/grooveshark.py | 7 | ||||
| -rw-r--r-- | youtube_dl/extractor/ndr.py | 2 | ||||
| -rw-r--r-- | youtube_dl/utils.py | 1 |
4 files changed, 12 insertions, 5 deletions
diff --git a/youtube_dl/YoutubeDL.py b/youtube_dl/YoutubeDL.py index 8732f3db4..172180d14 100755 --- a/youtube_dl/YoutubeDL.py +++ b/youtube_dl/YoutubeDL.py @@ -835,6 +835,13 @@ class YoutubeDL(object): format_1, format_2 = rf.split('+') formats_info = (self.select_format(format_1, formats), self.select_format(format_2, formats)) + # The first format must contain the video and the + # second the audio + if formats_info[0].get('vcodec') == 'none': + self.report_error('The first format must contain ' + 'the video, try using "-f %s+%s"' % + (format_2, format_1)) + return if all(formats_info): selected_format = { 'requested_formats': formats_info, diff --git a/youtube_dl/extractor/grooveshark.py b/youtube_dl/extractor/grooveshark.py index 726adff77..fff74a70a 100644 --- a/youtube_dl/extractor/grooveshark.py +++ b/youtube_dl/extractor/grooveshark.py @@ -8,12 +8,13 @@ import re from .common import InfoExtractor -from ..utils import ExtractorError, compat_urllib_request, compat_html_parser - -from ..utils import ( +from ..compat import ( + compat_html_parser, compat_urllib_parse, + compat_urllib_request, compat_urlparse, ) +from ..utils import ExtractorError class GroovesharkHtmlParser(compat_html_parser.HTMLParser): diff --git a/youtube_dl/extractor/ndr.py b/youtube_dl/extractor/ndr.py index add4b3e5d..c31ff8160 100644 --- a/youtube_dl/extractor/ndr.py +++ b/youtube_dl/extractor/ndr.py @@ -67,7 +67,7 @@ class NDRIE(InfoExtractor): thumbnail = None - video_url = re.search(r'''3: \{src:'(?P<video>.+?)\.hi\.mp4', type:"video/mp4"},''', page) + video_url = re.search(r'''3: \{src:'(?P<video>.+?)\.(lo|hi|hq)\.mp4', type:"video/mp4"},''', page) if video_url: thumbnails = re.findall(r'''\d+: \{src: "([^"]+)"(?: \|\| '[^']+')?, quality: '([^']+)'}''', page) if thumbnails: diff --git a/youtube_dl/utils.py b/youtube_dl/utils.py index 7c0fb1592..d87e212ae 100644 --- a/youtube_dl/utils.py +++ b/youtube_dl/utils.py @@ -34,7 +34,6 @@ from .compat import ( compat_chr, compat_getenv, compat_html_entities, - compat_html_parser, compat_parse_qs, compat_str, compat_urllib_error, |