From eb5a0aaa32d64b8f78fdd9426af6eb44d9338d36 Mon Sep 17 00:00:00 2001 From: Lars-Dominik Braun Date: Tue, 4 Aug 2015 19:43:38 +0200 Subject: Set ffmpeg proxy MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The proxy config setting did not set ffmpeg’s http proxy previously. See issue #531. --- src/settings.c | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'src') diff --git a/src/settings.c b/src/settings.c index 37928a9..3296f6e 100644 --- a/src/settings.c +++ b/src/settings.c @@ -368,6 +368,11 @@ void BarSettingsRead (BarSettings_t *settings) { } } + /* ffmpeg does not support setting an http proxy explicitly */ + if (settings->proxy != NULL) { + setenv ("http_proxy", settings->proxy, 1); + } + free (userhome); } -- cgit v1.2.3