about summary refs log tree commit diff
path: root/youtube_dl/extractor/abc.py
diff options
context:
space:
mode:
authorRemita Amine <remitamine@gmail.com>2016-08-22 07:48:40 +0100
committerRemita Amine <remitamine@gmail.com>2016-08-22 07:54:08 +0100
commitad316425840315b40405a55243635fcfbcae5f19 (patch)
tree507b4a4b0f9aaf6ea6872fdac7b6bf9e0e66654e /youtube_dl/extractor/abc.py
parentc7c43a93ba4abbd2175ab0891b63def7e25aa385 (diff)
downloadyoutube-dl-ad316425840315b40405a55243635fcfbcae5f19.tar.gz
youtube-dl-ad316425840315b40405a55243635fcfbcae5f19.tar.xz
youtube-dl-ad316425840315b40405a55243635fcfbcae5f19.zip
[nrk,abc:iview] use _extract_akamai_formats
Diffstat (limited to 'youtube_dl/extractor/abc.py')
-rw-r--r--youtube_dl/extractor/abc.py10
1 files changed, 1 insertions, 9 deletions
diff --git a/youtube_dl/extractor/abc.py b/youtube_dl/extractor/abc.py
index 879ded88d..c7b6df7d0 100644
--- a/youtube_dl/extractor/abc.py
+++ b/youtube_dl/extractor/abc.py
@@ -7,7 +7,6 @@ from ..utils import (
     ExtractorError,
     js_to_json,
     int_or_none,
-    update_url_query,
     parse_iso8601,
 )
 
@@ -123,14 +122,7 @@ class ABCIViewIE(InfoExtractor):
         title = video_params['title']
         stream = next(s for s in video_params['playlist'] if s.get('type') == 'program')
 
-        formats = []
-        f4m_url = stream.get('hds-unmetered') or stream['hds-metered']
-        formats.extend(self._extract_f4m_formats(
-            update_url_query(f4m_url, {'hdcore': '3.7.0'}),
-            video_id, f4m_id='hds', fatal=False))
-        formats.extend(self._extract_m3u8_formats(f4m_url.replace(
-            'akamaihd.net/z/', 'akamaihd.net/i/').replace('/manifest.f4m', '/master.m3u8'),
-            video_id, 'mp4', 'm3u8_native', m3u8_id='hls', fatal=False))
+        formats = self._extract_akamai_formats(stream['hds-unmetered'], video_id)
         self._sort_formats(formats)
 
         subtitles = {}