Skip to content

Commit

Permalink
[youtube] Pass in all variables to DASH manifest (Fixes #4424)
Browse files Browse the repository at this point in the history
  • Loading branch information
phihag committed Dec 10, 2014
1 parent b8a6114 commit da27660
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions youtube_dl/extractor/youtube.py
Original file line number Diff line number Diff line change
Expand Up @@ -682,7 +682,8 @@ def _extract_annotations(self, video_id):
url = 'https://www.youtube.com/annotations_invideo?features=1&legacy=1&video_id=%s' % video_id
return self._download_webpage(url, video_id, note='Searching for annotations.', errnote='Unable to download video annotations.')

def _parse_dash_manifest(self, video_id, dash_manifest_url):
def _parse_dash_manifest(
self, video_id, dash_manifest_url, player_url, age_gate):
def decrypt_sig(mobj):
s = mobj.group(1)
dec_s = self._decrypt_signature(s, video_id, player_url, age_gate)
Expand Down Expand Up @@ -1005,7 +1006,7 @@ def _map_to_format_list(urlmap):
dash_manifest_url = dash_mpd[0]
try:
dash_formats = self._parse_dash_manifest(
video_id, dash_manifest_url)
video_id, dash_manifest_url, player_url, age_gate)
except (ExtractorError, KeyError) as e:
self.report_warning(
'Skipping DASH manifest: %r' % e, video_id)
Expand Down

0 comments on commit da27660

Please sign in to comment.