From: Sergey M․ <dstftw@gmail.com>
Date: Fri, 18 Mar 2016 15:50:10 +0000 (+0600)
Subject: [extractor/generic] Properly extract format id from Content-Type
X-Git-Url: http://git.bitcoin.ninja/?a=commitdiff_plain;h=263eff9537c73caa9bff42b1e675043eaa124f9a;p=youtube-dl

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

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

diff --git a/youtube_dl/extractor/generic.py b/youtube_dl/extractor/generic.py
index 8121f04a5..b75db1252 100644
--- 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'))