diff options
| author | Rogério Brito <rbrito@ime.usp.br> | 2018-01-04 03:48:53 -0200 |
|---|---|---|
| committer | Rogério Brito <rbrito@ime.usp.br> | 2018-01-04 03:48:53 -0200 |
| commit | 9113dfef91df19343cf76c6274dd0a85258c1004 (patch) | |
| tree | 357bea65ff97d11085714837737d0428fbf40a54 /youtube_dl/downloader/hls.py | |
| parent | 80893415fd8cecb59cb8ffbea17a183d4202f02e (diff) | |
| parent | b4a0c9f9de9d715538a1718922d6ab01a40f7ce3 (diff) | |
| download | youtube-dl-9113dfef91df19343cf76c6274dd0a85258c1004.zip youtube-dl-9113dfef91df19343cf76c6274dd0a85258c1004.tar.gz youtube-dl-9113dfef91df19343cf76c6274dd0a85258c1004.tar.bz2 | |
Update upstream source from tag 'upstream/2017.12.31'
Update to upstream version '2017.12.31'
with Debian dir 1882f6f128562a71691f1092c6b611d46798c5c4
Diffstat (limited to 'youtube_dl/downloader/hls.py')
| -rw-r--r-- | youtube_dl/downloader/hls.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/youtube_dl/downloader/hls.py b/youtube_dl/downloader/hls.py index 1a6e226..4dc3ab4 100644 --- a/youtube_dl/downloader/hls.py +++ b/youtube_dl/downloader/hls.py @@ -163,7 +163,8 @@ class HlsFD(FragmentFD): return False if decrypt_info['METHOD'] == 'AES-128': iv = decrypt_info.get('IV') or compat_struct_pack('>8xq', media_sequence) - decrypt_info['KEY'] = decrypt_info.get('KEY') or self.ydl.urlopen(decrypt_info['URI']).read() + decrypt_info['KEY'] = decrypt_info.get('KEY') or self.ydl.urlopen( + self._prepare_url(info_dict, decrypt_info['URI'])).read() frag_content = AES.new( decrypt_info['KEY'], AES.MODE_CBC, iv).decrypt(frag_content) self._append_fragment(ctx, frag_content) |