summary refs log tree commit diff
diff options
context:
space:
mode:
authorremitamine <remitamine@gmail.com>2015-09-08 19:35:41 +0100
committerSergey M․ <dstftw@gmail.com>2015-10-24 19:01:54 +0600
commit3711304510d3be6a5f9b2b18084aad8687e78001 (patch)
treea34ace8d585faa6ba373abfe49d9b3ece4c32715
parent50b936936dcf53b448557c35a90e4678239aaf81 (diff)
downloadyoutube-dl-3711304510d3be6a5f9b2b18084aad8687e78001.tar.gz
youtube-dl-3711304510d3be6a5f9b2b18084aad8687e78001.tar.xz
youtube-dl-3711304510d3be6a5f9b2b18084aad8687e78001.zip
[extractor/common] get the redirected m3u8_url in _extract_m3u8_formats
-rw-r--r--youtube_dl/extractor/common.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/youtube_dl/extractor/common.py b/youtube_dl/extractor/common.py
index 04b699972..10c0d5d1f 100644
--- a/youtube_dl/extractor/common.py
+++ b/youtube_dl/extractor/common.py
@@ -943,13 +943,14 @@ class InfoExtractor(object):
             if re.match(r'^https?://', u)
             else compat_urlparse.urljoin(m3u8_url, u))
 
-        m3u8_doc = self._download_webpage(
+        m3u8_doc, urlh = self._download_webpage_handle(
             m3u8_url, video_id,
             note=note or 'Downloading m3u8 information',
             errnote=errnote or 'Failed to download m3u8 information',
             fatal=fatal)
         if m3u8_doc is False:
             return m3u8_doc
+        m3u8_url = urlh.geturl()
         last_info = None
         last_media = None
         kv_rex = re.compile(