diff --git a/.gitattributes b/.gitattributes index 58c855615e..f3e1df5b5b 100644 --- a/.gitattributes +++ b/.gitattributes @@ -2,3 +2,5 @@ Makefile* text whitespace=-tab-in-indent *.sh text eol=lf +*.md diff=markdown +*.py diff=python diff --git a/README.md b/README.md index 6b4f39b9e8..1624a1fcbf 100644 --- a/README.md +++ b/README.md @@ -70,7 +70,7 @@ # NEW FEATURES -* Based on **youtube-dl 2021.12.17 [commit/6508688](https://github.com/ytdl-org/youtube-dl/commit/6508688e88c83bb811653083db9351702cd39a6a)** and **youtube-dlc 2020.11.11-3 [commit/f9401f2](https://github.com/blackjack4494/yt-dlc/commit/f9401f2a91987068139c5f757b12fc711d4c0cee)**: You get all the features and patches of [youtube-dlc](https://github.com/blackjack4494/yt-dlc) in addition to the latest [youtube-dl](https://github.com/ytdl-org/youtube-dl) +* Based on **youtube-dl 2021.12.17 [commit/6508688](https://github.com/ytdl-org/youtube-dl/commit/6508688e88c83bb811653083db9351702cd39a6a)** ([exceptions](https://github.com/yt-dlp/yt-dlp/issues/21)) and **youtube-dlc 2020.11.11-3 [commit/f9401f2](https://github.com/blackjack4494/yt-dlc/commit/f9401f2a91987068139c5f757b12fc711d4c0cee)**: You get all the features and patches of [youtube-dlc](https://github.com/blackjack4494/yt-dlc) in addition to the latest [youtube-dl](https://github.com/ytdl-org/youtube-dl) * **[SponsorBlock Integration](#sponsorblock-options)**: You can mark/remove sponsor sections in youtube videos by utilizing the [SponsorBlock](https://sponsor.ajay.app) API @@ -783,8 +783,8 @@ ## Video Format Options: containers irrespective of quality --no-prefer-free-formats Don't give any special preference to free containers (default) - --check-formats Check that the selected formats are - actually downloadable + --check-formats Make sure formats are selected only from + those that are actually downloadable --check-all-formats Check all formats for whether they are actually downloadable --no-check-formats Do not check that the formats are actually @@ -1748,7 +1748,7 @@ # EMBEDDING YT-DLP ydl.download(['https://www.youtube.com/watch?v=BaW_jenozKc']) ``` -Most likely, you'll want to use various options. For a list of options available, have a look at [`yt_dlp/YoutubeDL.py`](yt_dlp/YoutubeDL.py#L195). +Most likely, you'll want to use various options. For a list of options available, have a look at [`yt_dlp/YoutubeDL.py`](yt_dlp/YoutubeDL.py#L197). Here's a more complete example demonstrating various functionality: diff --git a/yt_dlp/options.py b/yt_dlp/options.py index 06c613262b..67db6d0676 100644 --- a/yt_dlp/options.py +++ b/yt_dlp/options.py @@ -634,7 +634,7 @@ def _dict_from_options_callback( video_format.add_option( '--check-formats', action='store_const', const='selected', dest='check_formats', default=None, - help='Check that the selected formats are actually downloadable') + help='Make sure formats are selected only from those that are actually downloadable') video_format.add_option( '--check-all-formats', action='store_true', dest='check_formats',