diff options
| author | Philipp Hagemeister <phihag@phihag.de> | 2015-03-03 13:57:29 +0100 |
|---|---|---|
| committer | Philipp Hagemeister <phihag@phihag.de> | 2015-03-03 13:57:29 +0100 |
| commit | 938c3f65b6c1c1f5b8f7eb731a3eef00a06b6128 (patch) | |
| tree | f57ce8894e85902d654ef7c009572f26fb60f3cb /youtube_dl/__init__.py | |
| parent | 499bfcbfd09e85f053d7e8943a8d47fed9349b0e (diff) | |
| parent | 2461f79d2ad9eee44644f6187e366125a29aa70f (diff) | |
Merge branch 'cn-verification-proxy'
Diffstat (limited to 'youtube_dl/__init__.py')
| -rw-r--r-- | youtube_dl/__init__.py | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/youtube_dl/__init__.py b/youtube_dl/__init__.py index 6056da1be..a08ddd670 100644 --- a/youtube_dl/__init__.py +++ b/youtube_dl/__init__.py @@ -364,6 +364,7 @@ def _real_main(argv=None): 'ffmpeg_location': opts.ffmpeg_location, 'hls_prefer_native': opts.hls_prefer_native, 'external_downloader_args': external_downloader_args, + 'cn_verification_proxy': opts.cn_verification_proxy, } with YoutubeDL(ydl_opts) as ydl: |