projects
/
youtube-dl
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
87f0e62
)
[downloader/hls] Respect Youtubedl-* headers
author
Yen Chi Hsuan
<yan12125@gmail.com>
Sun, 29 Nov 2015 04:43:59 +0000
(12:43 +0800)
committer
Yen Chi Hsuan
<yan12125@gmail.com>
Sun, 29 Nov 2015 04:43:59 +0000
(12:43 +0800)
youtube_dl/downloader/hls.py
patch
|
blob
|
history
diff --git
a/youtube_dl/downloader/hls.py
b/youtube_dl/downloader/hls.py
index 92765a3f9c6acdbc91136fbe00d24197af71fa29..b5a3e11676e72d070ec1a48c6483d0cc630c70a7 100644
(file)
--- a/
youtube_dl/downloader/hls.py
+++ b/
youtube_dl/downloader/hls.py
@@
-13,6
+13,7
@@
from ..utils import (
encodeArgument,
encodeFilename,
sanitize_open,
encodeArgument,
encodeFilename,
sanitize_open,
+ handle_youtubedl_headers,
)
)
@@
-33,9
+34,10
@@
class HlsFD(FileDownloader):
if info_dict['http_headers'] and re.match(r'^https?://', url):
# Trailing \r\n after each HTTP header is important to prevent warning from ffmpeg/avconv:
# [http @ 00000000003d2fa0] No trailing CRLF found in HTTP header.
if info_dict['http_headers'] and re.match(r'^https?://', url):
# Trailing \r\n after each HTTP header is important to prevent warning from ffmpeg/avconv:
# [http @ 00000000003d2fa0] No trailing CRLF found in HTTP header.
+ headers = handle_youtubedl_headers(info_dict['http_headers'])
args += [
'-headers',
args += [
'-headers',
- ''.join('%s: %s\r\n' % (key, val) for key, val in
info_dict['http_headers'].items() if key.lower() != 'accept-encoding'
)]
+ ''.join('%s: %s\r\n' % (key, val) for key, val in
headers.items()
)]
args += ['-i', url, '-f', 'mp4', '-c', 'copy', '-bsf:a', 'aac_adtstoasc']
args += ['-i', url, '-f', 'mp4', '-c', 'copy', '-bsf:a', 'aac_adtstoasc']