From: Sergey M․ <dstftw@gmail.com>
Date: Tue, 22 Sep 2015 20:46:24 +0000 (+0600)
Subject: [downloader/hls] Pass http headers to downloader
X-Git-Url: http://git.oshgnacknak.de/?a=commitdiff_plain;h=f1028194636e7acafb29fb38244cc7b1347d9313;p=youtube-dl

[downloader/hls] Pass http headers to downloader
---

diff --git a/youtube_dl/downloader/hls.py b/youtube_dl/downloader/hls.py
index 7743e176a..a62d2047b 100644
--- a/youtube_dl/downloader/hls.py
+++ b/youtube_dl/downloader/hls.py
@@ -28,9 +28,18 @@ class HlsFD(FileDownloader):
             return False
         ffpp.check_version()
 
-        args = [
-            encodeArgument(opt)
-            for opt in (ffpp.executable, '-y', '-i', url, '-f', 'mp4', '-c', 'copy', '-bsf:a', 'aac_adtstoasc')]
+        args = [ffpp.executable, '-y']
+
+        if info_dict['http_headers']:
+            # Trailing \r\n after each HTTP header is important to prevent warning from ffmpeg/avconv:
+            # [http @ 00000000003d2fa0] No trailing CRLF found in HTTP header.
+            args += [
+                '-headers',
+                ''.join('%s: %s\r\n' % (key, val) for key, val in info_dict['http_headers'].items())]
+
+        args += ['-i', url, '-f', 'mp4', '-c', 'copy', '-bsf:a', 'aac_adtstoasc']
+
+        args = [encodeArgument(opt) for opt in args]
         args.append(encodeFilename(ffpp._ffmpeg_filename_argument(tmpfilename), True))
 
         self._debug_cmd(args)