diff options
| author | remitamine <remitamine@gmail.com> | 2016-02-06 06:26:02 +0100 |
|---|---|---|
| committer | remitamine <remitamine@gmail.com> | 2016-02-06 06:26:02 +0100 |
| commit | 66159b38aad38d55f84a358a0c2ed2add9a2946d (patch) | |
| tree | 4768cc49d929039a5a3c866600b7c0aee475f35d /youtube_dl/extractor/youtube.py | |
| parent | 23d17e4bebdff9a5defa012e4fa5cd99db605919 (diff) | |
| parent | 255732f0d33268aeababb1b3ce37a1defb5bc965 (diff) | |
Merge pull request #8408 from remitamine/dash
Add generic support for mpd manifests(dash formats)
Diffstat (limited to 'youtube_dl/extractor/youtube.py')
| -rw-r--r-- | youtube_dl/extractor/youtube.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/youtube_dl/extractor/youtube.py b/youtube_dl/extractor/youtube.py index 9b346d27a..63abe5477 100644 --- a/youtube_dl/extractor/youtube.py +++ b/youtube_dl/extractor/youtube.py @@ -1464,7 +1464,7 @@ class YoutubeIE(YoutubeBaseInfoExtractor): # Look for the DASH manifest if self._downloader.params.get('youtube_include_dash_manifest', True): dash_mpd_fatal = True - for dash_manifest_url in dash_mpds: + for mpd_url in dash_mpds: dash_formats = {} try: def decrypt_sig(mobj): @@ -1472,11 +1472,11 @@ class YoutubeIE(YoutubeBaseInfoExtractor): dec_s = self._decrypt_signature(s, video_id, player_url, age_gate) return '/signature/%s' % dec_s - dash_manifest_url = re.sub(r'/s/([a-fA-F0-9\.]+)', decrypt_sig, dash_manifest_url) + mpd_url = re.sub(r'/s/([a-fA-F0-9\.]+)', decrypt_sig, mpd_url) - for df in self._extract_dash_manifest_formats( - dash_manifest_url, video_id, fatal=dash_mpd_fatal, - namespace='urn:mpeg:DASH:schema:MPD:2011', formats_dict=self._formats): + for df in self._extract_mpd_formats( + mpd_url, video_id, fatal=dash_mpd_fatal, + formats_dict=self._formats): # Do not overwrite DASH format found in some previous DASH manifest if df['format_id'] not in dash_formats: dash_formats[df['format_id']] = df |