projects
/
youtube-dl
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
35a2d22
)
[youtube] Fix DASH manifest signature decryption (closes #8944)
author
Protuhj
<ihatespam234@gmail.com>
Sat, 20 May 2017 18:11:37 +0000
(14:11 -0400)
committer
Sergey M
<dstftw@gmail.com>
Sat, 20 May 2017 18:11:37 +0000
(
01:11
+0700)
youtube_dl/extractor/youtube.py
patch
|
blob
|
history
diff --git
a/youtube_dl/extractor/youtube.py
b/youtube_dl/extractor/youtube.py
index 44a39282f104ff6bf588c7eee5122b190c8dba15..ae832cac5b27bd48577e94ee25f15b9dc9870dcb 100644
(file)
--- a/
youtube_dl/extractor/youtube.py
+++ b/
youtube_dl/extractor/youtube.py
@@
-1435,6
+1435,7
@@
class YoutubeIE(YoutubeBaseInfoExtractor):
else:
age_gate = False
video_info = None
else:
age_gate = False
video_info = None
+ sts = ''
# Try looking directly into the video webpage
ytplayer_config = self._get_ytplayer_config(video_id, video_webpage)
if ytplayer_config:
# Try looking directly into the video webpage
ytplayer_config = self._get_ytplayer_config(video_id, video_webpage)
if ytplayer_config:
@@
-1451,6
+1452,7
@@
class YoutubeIE(YoutubeBaseInfoExtractor):
args['ypc_vid'], YoutubeIE.ie_key(), video_id=args['ypc_vid'])
if args.get('livestream') == '1' or args.get('live_playback') == 1:
is_live = True
args['ypc_vid'], YoutubeIE.ie_key(), video_id=args['ypc_vid'])
if args.get('livestream') == '1' or args.get('live_playback') == 1:
is_live = True
+ sts = ytplayer_config.get('sts', '')
if not video_info or self._downloader.params.get('youtube_include_dash_manifest', True):
# We also try looking in get_video_info since it may contain different dashmpd
# URL that points to a DASH manifest with possibly different itag set (some itags
if not video_info or self._downloader.params.get('youtube_include_dash_manifest', True):
# We also try looking in get_video_info since it may contain different dashmpd
# URL that points to a DASH manifest with possibly different itag set (some itags
@@
-1461,8
+1463,8
@@
class YoutubeIE(YoutubeBaseInfoExtractor):
self.report_video_info_webpage_download(video_id)
for el_type in ['&el=info', '&el=embedded', '&el=detailpage', '&el=vevo', '']:
video_info_url = (
self.report_video_info_webpage_download(video_id)
for el_type in ['&el=info', '&el=embedded', '&el=detailpage', '&el=vevo', '']:
video_info_url = (
- '%s://www.youtube.com/get_video_info?&video_id=%s%s&ps=default&eurl=&gl=US&hl=en'
- % (proto, video_id, el_type))
+ '%s://www.youtube.com/get_video_info?&video_id=%s%s&ps=default&eurl=&gl=US&hl=en
&sts=%s
'
+ % (proto, video_id, el_type
, sts
))
video_info_webpage = self._download_webpage(
video_info_url,
video_id, note=False,
video_info_webpage = self._download_webpage(
video_info_url,
video_id, note=False,