youtube-dl

commit 263eff9537c73caa9bff42b1e675043eaa124f9a
parent cae21032ab38f404a9959e6b28984b960e579fb5
Author: Sergey M․ <dstftw@gmail.com>
Date:   Fri, 18 Mar 2016 21:50:10 +0600

[extractor/generic] Properly extract format id from Content-Type

Fixes extraction for cases like: audio/x-mpegURL; charset=utf-8

Diffstat:
M
youtube_dl/extractor/generic.py
 | 
2
+-

1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/youtube_dl/extractor/generic.py b/youtube_dl/extractor/generic.py
@@ -1249,7 +1249,7 @@ class GenericIE(InfoExtractor):
 
         # Check for direct link to a video
         content_type = head_response.headers.get('Content-Type', '')
-        m = re.match(r'^(?P<type>audio|video|application(?=/(?:ogg$|(?:vnd\.apple\.|x-)?mpegurl)))/(?P<format_id>.+)$', content_type)
+        m = re.match(r'^(?P<type>audio|video|application(?=/(?:ogg$|(?:vnd\.apple\.|x-)?mpegurl)))/(?P<format_id>[^;\s]+)', content_type)
         if m:
             upload_date = unified_strdate(
                 head_response.headers.get('Last-Modified'))