]> gitweb @ CieloNegro.org - youtube-dl.git/commitdiff
[downloader/external] Clarify that ffmpeg doesn't support SOCKS
authorYen Chi Hsuan <yan12125@gmail.com>
Thu, 25 Aug 2016 14:38:06 +0000 (22:38 +0800)
committerYen Chi Hsuan <yan12125@gmail.com>
Thu, 25 Aug 2016 14:38:06 +0000 (22:38 +0800)
Ref: #10304

youtube_dl/downloader/external.py

index cf45562217ac0c27b77f3a241f3881d770d800ce..17f12e970e805d9a3ea7976ba12e6315b88156b9 100644 (file)
@@ -220,6 +220,11 @@ 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 may fail.' % 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