summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorLars-Dominik Braun <lars@6xq.net>2015-08-04 19:43:38 +0200
committerLars-Dominik Braun <lars@6xq.net>2015-08-04 19:43:38 +0200
commiteb5a0aaa32d64b8f78fdd9426af6eb44d9338d36 (patch)
treeb82635f859e56375457f2db8d4045b5b870d515e /src
parent83871b252911a407db509d72f7fad9e8b6356c73 (diff)
downloadpianobar-windows-eb5a0aaa32d64b8f78fdd9426af6eb44d9338d36.tar.gz
pianobar-windows-eb5a0aaa32d64b8f78fdd9426af6eb44d9338d36.tar.bz2
pianobar-windows-eb5a0aaa32d64b8f78fdd9426af6eb44d9338d36.zip
Set ffmpeg proxy
The proxy config setting did not set ffmpeg’s http proxy previously. See issue #531.
Diffstat (limited to 'src')
-rw-r--r--src/settings.c5
1 files changed, 5 insertions, 0 deletions
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);
}