aboutsummaryrefslogtreecommitdiffhomepage
path: root/youtube_dl/downloader
diff options
context:
space:
mode:
authorYen Chi Hsuan <[email protected]>2016-06-08 14:43:52 +0800
committerYen Chi Hsuan <[email protected]>2016-06-08 14:43:52 +0800
commit50ce1c331c736d8219f3bf631ff069b9aecc48e3 (patch)
tree11114c6b4a2e801af00f38e58d95c8d6dcae54a1 /youtube_dl/downloader
parent7264e385912951167c27b40df5fd22010d594b12 (diff)
downloadyoutube-dl-50ce1c331c736d8219f3bf631ff069b9aecc48e3.tar.gz
youtube-dl-50ce1c331c736d8219f3bf631ff069b9aecc48e3.zip
[downloader/external] Add another env for proxies in ffmpeg/avconv
Related sources: https://git.libav.org/?p=libav.git;a=blob;f=libavformat/http.c;h=8fe8d11e1edfdbb04a8726db2c49cfef3f572aac;hb=HEAD#l152 https://git.libav.org/?p=libav.git;a=blob;f=libavformat/tls.c;h=fab243e93e20034e88e619188c13a44a5d8ccdb9;hb=HEAD#l63 https://github.com/FFmpeg/FFmpeg/blob/f8e89d8/libavformat/http.c#L191 https://github.com/FFmpeg/FFmpeg/blob/f8e89d8/libavformat/tls.c#L92
Diffstat (limited to 'youtube_dl/downloader')
-rw-r--r--youtube_dl/downloader/external.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/youtube_dl/downloader/external.py b/youtube_dl/downloader/external.py
index 3a73cee1c..3ff1f9ed4 100644
--- a/youtube_dl/downloader/external.py
+++ b/youtube_dl/downloader/external.py
@@ -210,6 +210,7 @@ class FFmpegFD(ExternalFD):
# args += ['-http_proxy', proxy]
env = os.environ.copy()
compat_setenv('HTTP_PROXY', proxy, env=env)
+ compat_setenv('http_proxy', proxy, env=env)
protocol = info_dict.get('protocol')