diff options
| author | Rogério Brito <rbrito@ime.usp.br> | 2016-11-30 17:22:52 -0200 |
|---|---|---|
| committer | Rogério Brito <rbrito@ime.usp.br> | 2016-11-30 17:22:52 -0200 |
| commit | 87a0165ca7e39af4dacb7ec637063b2cd35ae40b (patch) | |
| tree | ef753773addf91c27e791587361fc4512ec281cf /youtube_dl/downloader/external.py | |
| parent | ced7488f6d3a519b2c1b1cbd31048743fb8285bd (diff) | |
| download | youtube-dl-87a0165ca7e39af4dacb7ec637063b2cd35ae40b.zip youtube-dl-87a0165ca7e39af4dacb7ec637063b2cd35ae40b.tar.gz youtube-dl-87a0165ca7e39af4dacb7ec637063b2cd35ae40b.tar.bz2 | |
New upstream version 2016.12.01
Diffstat (limited to 'youtube_dl/downloader/external.py')
| -rw-r--r-- | youtube_dl/downloader/external.py | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/youtube_dl/downloader/external.py b/youtube_dl/downloader/external.py index cf45562..5d3e5d8 100644 --- a/youtube_dl/downloader/external.py +++ b/youtube_dl/downloader/external.py @@ -220,6 +220,12 @@ class FFmpegFD(ExternalFD): if proxy: if not re.match(r'^[\da-zA-Z]+://', proxy): proxy = 'http://%s' % proxy + + if proxy.startswith('socks'): + self.report_warning( + '%s does not support SOCKS proxies. Downloading is likely to fail. ' + 'Consider adding --hls-prefer-native to your command.' % self.get_basename()) + # Since December 2015 ffmpeg supports -http_proxy option (see # http://git.videolan.org/?p=ffmpeg.git;a=commit;h=b4eb1f29ebddd60c41a2eb39f5af701e38e0d3fd) # We could switch to the following code if we are able to detect version properly @@ -287,6 +293,7 @@ class FFmpegFD(ExternalFD): class AVconvFD(FFmpegFD): pass + _BY_NAME = dict( (klass.get_basename(), klass) for name, klass in globals().items() |