From: Unknown <redacted>
Date: Mon, 14 Sep 2020 10:50:56 +0000 (+0200)
Subject: merge ytdl-master
X-Git-Tag: 2021.01.07~160^2
X-Git-Url: https://jfr.im/git/yt-dlp.git/commitdiff_plain/e69dd7809034c0bec432438e2aa96b70fdea8294

merge ytdl-master
---

e69dd7809034c0bec432438e2aa96b70fdea8294
diff --cc .github/ISSUE_TEMPLATE/1_broken_site.md
index f05aa66e6,352263789..e49e0749f
--- a/.github/ISSUE_TEMPLATE/1_broken_site.md
+++ b/.github/ISSUE_TEMPLATE/1_broken_site.md
@@@ -17,8 -17,8 +17,8 @@@ title: '
  ## Checklist
  
  <!--
--Carefully read and work through this check list in order to prevent the most common mistakes and misuse of youtube-dl:
- - First of, make sure you are using the latest version of youtube-dl. Run `youtube-dl --version` and ensure your version is 2020.09.06. If it's not, see https://yt-dl.org/update on how to update. Issues with outdated version will be REJECTED.
 -- First of, make sure you are using the latest version of youtube-dl. Run `youtube-dl --version` and ensure your version is 2020.09.14. If it's not, see https://yt-dl.org/update on how to update. Issues with outdated version will be REJECTED.
++Carefully read and work through this check list in order to prevent the most common mistakes and misuse of youtube-dlc:
++- First of, make sure you are using the latest version of youtube-dlc. Run `youtube-dlc --version` and ensure your version is 2020.09.14. If it's not, see https://yt-dl.org/update on how to update. Issues with outdated version will be REJECTED.
  - Make sure that all provided video/audio/playlist URLs (if any) are alive and playable in a browser.
  - Make sure that all URLs and arguments with special characters are properly quoted or escaped as explained in http://yt-dl.org/escape.
  - Search the bugtracker for similar issues: http://yt-dl.org/search-issues. DO NOT post duplicates.
@@@ -26,7 -26,7 +26,7 @@@
  -->
  
  - [ ] I'm reporting a broken site support
- - [ ] I've verified that I'm running youtube-dl version **2020.09.06**
 -- [ ] I've verified that I'm running youtube-dl version **2020.09.14**
++- [ ] I've verified that I'm running youtube-dlc version **2020.09.14**
  - [ ] I've checked that all provided URLs are alive and playable in a browser
  - [ ] I've checked that all URLs and arguments with special characters are properly quoted or escaped
  - [ ] I've searched the bugtracker for similar issues including closed ones
@@@ -35,13 -35,13 +35,13 @@@
  ## Verbose log
  
  <!--
--Provide the complete verbose output of youtube-dl that clearly demonstrates the problem.
--Add the `-v` flag to your command line you run youtube-dl with (`youtube-dl -v <your command line>`), copy the WHOLE output and insert it below. It should look similar to this:
++Provide the complete verbose output of youtube-dlc that clearly demonstrates the problem.
++Add the `-v` flag to your command line you run youtube-dlc with (`youtube-dlc -v <your command line>`), copy the WHOLE output and insert it below. It should look similar to this:
   [debug] System config: []
   [debug] User config: []
   [debug] Command-line args: [u'-v', u'http://www.youtube.com/watch?v=BaW_jenozKcj']
   [debug] Encodings: locale cp1251, fs mbcs, out cp866, pref cp1251
-  [debug] youtube-dl version 2020.09.06
 - [debug] youtube-dl version 2020.09.14
++ [debug] youtube-dlc version 2020.09.14
   [debug] Python version 2.7.11 - Windows-2003Server-5.2.3790-SP2
   [debug] exe versions: ffmpeg N-75573-g1d0487f, ffprobe N-75573-g1d0487f, rtmpdump 2.4
   [debug] Proxy map: {}
diff --cc .github/ISSUE_TEMPLATE/2_site_support_request.md
index 29beaf437,fa6509be3..77be9b360
--- a/.github/ISSUE_TEMPLATE/2_site_support_request.md
+++ b/.github/ISSUE_TEMPLATE/2_site_support_request.md
@@@ -18,16 -18,16 +18,16 @@@ labels: 'site-support-request
  ## Checklist
  
  <!--
--Carefully read and work through this check list in order to prevent the most common mistakes and misuse of youtube-dl:
- - First of, make sure you are using the latest version of youtube-dl. Run `youtube-dl --version` and ensure your version is 2020.09.06. If it's not, see https://yt-dl.org/update on how to update. Issues with outdated version will be REJECTED.
 -- First of, make sure you are using the latest version of youtube-dl. Run `youtube-dl --version` and ensure your version is 2020.09.14. If it's not, see https://yt-dl.org/update on how to update. Issues with outdated version will be REJECTED.
++Carefully read and work through this check list in order to prevent the most common mistakes and misuse of youtube-dlc:
++- First of, make sure you are using the latest version of youtube-dlc. Run `youtube-dlc --version` and ensure your version is 2020.09.14. If it's not, see https://yt-dl.org/update on how to update. Issues with outdated version will be REJECTED.
  - Make sure that all provided video/audio/playlist URLs (if any) are alive and playable in a browser.
--- Make sure that site you are requesting is not dedicated to copyright infringement, see https://yt-dl.org/copyright-infringement. youtube-dl does not support such sites. In order for site support request to be accepted all provided example URLs should not violate any copyrights.
++- Make sure that site you are requesting is not dedicated to copyright infringement, see https://yt-dl.org/copyright-infringement. youtube-dlc does not support such sites. In order for site support request to be accepted all provided example URLs should not violate any copyrights.
  - Search the bugtracker for similar site support requests: http://yt-dl.org/search-issues. DO NOT post duplicates.
  - Finally, put x into all relevant boxes (like this [x])
  -->
  
  - [ ] I'm reporting a new site support request
- - [ ] I've verified that I'm running youtube-dl version **2020.09.06**
 -- [ ] I've verified that I'm running youtube-dl version **2020.09.14**
++- [ ] I've verified that I'm running youtube-dlcc version **2020.09.14**
  - [ ] I've checked that all provided URLs are alive and playable in a browser
  - [ ] I've checked that none of provided URLs violate any copyrights
  - [ ] I've searched the bugtracker for similar site support requests including closed ones
diff --cc .github/ISSUE_TEMPLATE/3_site_feature_request.md
index f96b8d2bb,70b0f2f19..c1c5aa061
--- a/.github/ISSUE_TEMPLATE/3_site_feature_request.md
+++ b/.github/ISSUE_TEMPLATE/3_site_feature_request.md
@@@ -17,21 -17,21 +17,21 @@@ title: '
  ## Checklist
  
  <!--
--Carefully read and work through this check list in order to prevent the most common mistakes and misuse of youtube-dl:
- - First of, make sure you are using the latest version of youtube-dl. Run `youtube-dl --version` and ensure your version is 2020.09.06. If it's not, see https://yt-dl.org/update on how to update. Issues with outdated version will be REJECTED.
 -- First of, make sure you are using the latest version of youtube-dl. Run `youtube-dl --version` and ensure your version is 2020.09.14. If it's not, see https://yt-dl.org/update on how to update. Issues with outdated version will be REJECTED.
++Carefully read and work through this check list in order to prevent the most common mistakes and misuse of youtube-dlc:
++- First of, make sure you are using the latest version of youtube-dlc. Run `youtube-dlc --version` and ensure your version is 2020.09.14. If it's not, see https://yt-dl.org/update on how to update. Issues with outdated version will be REJECTED.
  - Search the bugtracker for similar site feature requests: http://yt-dl.org/search-issues. DO NOT post duplicates.
  - Finally, put x into all relevant boxes (like this [x])
  -->
  
  - [ ] I'm reporting a site feature request
- - [ ] I've verified that I'm running youtube-dl version **2020.09.06**
 -- [ ] I've verified that I'm running youtube-dl version **2020.09.14**
++- [ ] I've verified that I'm running youtube-dlc version **2020.09.14**
  - [ ] I've searched the bugtracker for similar site feature requests including closed ones
  
  
  ## Description
  
  <!--
--Provide an explanation of your site feature request in an arbitrary form. Please make sure the description is worded well enough to be understood, see https://github.com/ytdl-org/youtube-dl#is-the-description-of-the-issue-itself-sufficient. Provide any additional information, suggested solution and as much context and examples as possible.
++Provide an explanation of your site feature request in an arbitrary form. Please make sure the description is worded well enough to be understood, see https://github.com/ytdl-org/youtube-dlc#is-the-description-of-the-issue-itself-sufficient. Provide any additional information, suggested solution and as much context and examples as possible.
  -->
  
  WRITE DESCRIPTION HERE
diff --cc .github/ISSUE_TEMPLATE/4_bug_report.md
index 3a175aa4d,ec17e4a33..49a332c96
--- a/.github/ISSUE_TEMPLATE/4_bug_report.md
+++ b/.github/ISSUE_TEMPLATE/4_bug_report.md
@@@ -17,8 -17,8 +17,8 @@@ title: '
  ## Checklist
  
  <!--
--Carefully read and work through this check list in order to prevent the most common mistakes and misuse of youtube-dl:
- - First of, make sure you are using the latest version of youtube-dl. Run `youtube-dl --version` and ensure your version is 2020.09.06. If it's not, see https://yt-dl.org/update on how to update. Issues with outdated version will be REJECTED.
 -- First of, make sure you are using the latest version of youtube-dl. Run `youtube-dl --version` and ensure your version is 2020.09.14. If it's not, see https://yt-dl.org/update on how to update. Issues with outdated version will be REJECTED.
++Carefully read and work through this check list in order to prevent the most common mistakes and misuse of youtube-dlc:
++- First of, make sure you are using the latest version of youtube-dlc. Run `youtube-dlc --version` and ensure your version is 2020.09.14. If it's not, see https://yt-dl.org/update on how to update. Issues with outdated version will be REJECTED.
  - Make sure that all provided video/audio/playlist URLs (if any) are alive and playable in a browser.
  - Make sure that all URLs and arguments with special characters are properly quoted or escaped as explained in http://yt-dl.org/escape.
  - Search the bugtracker for similar issues: http://yt-dl.org/search-issues. DO NOT post duplicates.
@@@ -27,7 -27,7 +27,7 @@@
  -->
  
  - [ ] I'm reporting a broken site support issue
- - [ ] I've verified that I'm running youtube-dl version **2020.09.06**
 -- [ ] I've verified that I'm running youtube-dl version **2020.09.14**
++- [ ] I've verified that I'm running youtube-dlc version **2020.09.14**
  - [ ] I've checked that all provided URLs are alive and playable in a browser
  - [ ] I've checked that all URLs and arguments with special characters are properly quoted or escaped
  - [ ] I've searched the bugtracker for similar bug reports including closed ones
@@@ -37,13 -37,13 +37,13 @@@
  ## Verbose log
  
  <!--
--Provide the complete verbose output of youtube-dl that clearly demonstrates the problem.
--Add the `-v` flag to your command line you run youtube-dl with (`youtube-dl -v <your command line>`), copy the WHOLE output and insert it below. It should look similar to this:
++Provide the complete verbose output of youtube-dlc that clearly demonstrates the problem.
++Add the `-v` flag to your command line you run youtube-dlc with (`youtube-dlc -v <your command line>`), copy the WHOLE output and insert it below. It should look similar to this:
   [debug] System config: []
   [debug] User config: []
   [debug] Command-line args: [u'-v', u'http://www.youtube.com/watch?v=BaW_jenozKcj']
   [debug] Encodings: locale cp1251, fs mbcs, out cp866, pref cp1251
-  [debug] youtube-dl version 2020.09.06
 - [debug] youtube-dl version 2020.09.14
++ [debug] youtube-dlc version 2020.09.14
   [debug] Python version 2.7.11 - Windows-2003Server-5.2.3790-SP2
   [debug] exe versions: ffmpeg N-75573-g1d0487f, ffprobe N-75573-g1d0487f, rtmpdump 2.4
   [debug] Proxy map: {}
@@@ -58,7 -58,7 +58,7 @@@ PASTE VERBOSE LOG HER
  ## Description
  
  <!--
--Provide an explanation of your issue in an arbitrary form. Please make sure the description is worded well enough to be understood, see https://github.com/ytdl-org/youtube-dl#is-the-description-of-the-issue-itself-sufficient. Provide any additional information, suggested solution and as much context and examples as possible.
++Provide an explanation of your issue in an arbitrary form. Please make sure the description is worded well enough to be understood, see https://github.com/ytdl-org/youtube-dlc#is-the-description-of-the-issue-itself-sufficient. Provide any additional information, suggested solution and as much context and examples as possible.
  If work on your issue requires account credentials please provide them or explain how one can obtain them.
  -->
  
diff --cc .github/ISSUE_TEMPLATE/5_feature_request.md
index 4977079de,6ac963206..6356f998c
--- a/.github/ISSUE_TEMPLATE/5_feature_request.md
+++ b/.github/ISSUE_TEMPLATE/5_feature_request.md
@@@ -18,21 -18,21 +18,21 @@@ labels: 'request
  ## Checklist
  
  <!--
--Carefully read and work through this check list in order to prevent the most common mistakes and misuse of youtube-dl:
- - First of, make sure you are using the latest version of youtube-dl. Run `youtube-dl --version` and ensure your version is 2020.09.06. If it's not, see https://yt-dl.org/update on how to update. Issues with outdated version will be REJECTED.
 -- First of, make sure you are using the latest version of youtube-dl. Run `youtube-dl --version` and ensure your version is 2020.09.14. If it's not, see https://yt-dl.org/update on how to update. Issues with outdated version will be REJECTED.
++Carefully read and work through this check list in order to prevent the most common mistakes and misuse of youtube-dlc:
++- First of, make sure you are using the latest version of youtube-dlc. Run `youtube-dlc --version` and ensure your version is 2020.09.14. If it's not, see https://yt-dl.org/update on how to update. Issues with outdated version will be REJECTED.
  - Search the bugtracker for similar feature requests: http://yt-dl.org/search-issues. DO NOT post duplicates.
  - Finally, put x into all relevant boxes (like this [x])
  -->
  
  - [ ] I'm reporting a feature request
- - [ ] I've verified that I'm running youtube-dl version **2020.09.06**
 -- [ ] I've verified that I'm running youtube-dl version **2020.09.14**
++- [ ] I've verified that I'm running youtube-dlc version **2020.09.14**
  - [ ] I've searched the bugtracker for similar feature requests including closed ones
  
  
  ## Description
  
  <!--
--Provide an explanation of your issue in an arbitrary form. Please make sure the description is worded well enough to be understood, see https://github.com/ytdl-org/youtube-dl#is-the-description-of-the-issue-itself-sufficient. Provide any additional information, suggested solution and as much context and examples as possible.
++Provide an explanation of your issue in an arbitrary form. Please make sure the description is worded well enough to be understood, see https://github.com/ytdl-org/youtube-dlc#is-the-description-of-the-issue-itself-sufficient. Provide any additional information, suggested solution and as much context and examples as possible.
  -->
  
  WRITE DESCRIPTION HERE