projects
/
youtube-dl
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
1bac345
)
[youtube] use _extract_mpd_formats
author
remitamine
<remitamine@gmail.com>
Tue, 2 Feb 2016 17:10:23 +0000
(18:10 +0100)
committer
remitamine
<remitamine@gmail.com>
Tue, 2 Feb 2016 17:10:23 +0000
(18:10 +0100)
youtube_dl/extractor/youtube.py
patch
|
blob
|
history
diff --git
a/youtube_dl/extractor/youtube.py
b/youtube_dl/extractor/youtube.py
index a7f8c968ef2eb870355be1898bafe123e59dc294..828f5d1f4b0dbe3245a9fff6076553cd5dfbb87c 100644
(file)
--- a/
youtube_dl/extractor/youtube.py
+++ b/
youtube_dl/extractor/youtube.py
@@
-1463,7
+1463,7
@@
class YoutubeIE(YoutubeBaseInfoExtractor):
# Look for the DASH manifest
if self._downloader.params.get('youtube_include_dash_manifest', True):
dash_mpd_fatal = True
# 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):
dash_formats = {}
try:
def decrypt_sig(mobj):
@@
-1471,11
+1471,11
@@
class YoutubeIE(YoutubeBaseInfoExtractor):
dec_s = self._decrypt_signature(s, video_id, player_url, age_gate)
return '/signature/%s' % dec_s
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
# 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