aboutsummaryrefslogtreecommitdiffstats
path: root/yt_dlp/options.py
diff options
context:
space:
mode:
authorLauren N. Liberda <laura@selfisekai.rocks>2022-08-04 02:42:12 +0200
committerGitHub <noreply@github.com>2022-08-04 06:12:12 +0530
commitfc61aff41beae0063b306dd9d74cc4ff27f0eff7 (patch)
tree9207f5e28f69a3b53980653e00ff3c1e927fc27a /yt_dlp/options.py
parentfe0918bb65c828ec81ce904cece58d450c117eba (diff)
downloadhypervideo-pre-fc61aff41beae0063b306dd9d74cc4ff27f0eff7.tar.lz
hypervideo-pre-fc61aff41beae0063b306dd9d74cc4ff27f0eff7.tar.xz
hypervideo-pre-fc61aff41beae0063b306dd9d74cc4ff27f0eff7.zip
Determine merge container better (See desc) (#1482)
* Determine the container early. Closes #4069 * Use codecs instead of just file extensions * Obey `--prefer-free-formats` * Allow fallbacks in `--merge-output` Authored by: pukkandan, selfisekai
Diffstat (limited to 'yt_dlp/options.py')
-rw-r--r--yt_dlp/options.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/yt_dlp/options.py b/yt_dlp/options.py
index 236cc714b..b70f5798e 100644
--- a/yt_dlp/options.py
+++ b/yt_dlp/options.py
@@ -782,7 +782,8 @@ def create_parser():
'--merge-output-format',
action='store', dest='merge_output_format', metavar='FORMAT', default=None,
help=(
- 'Container to use when merging formats (e.g. bestvideo+bestaudio). Ignored if no merge is required. '
+ 'Containers that may be used when merging formats, separated by "/" (Eg: "mp4/mkv"). '
+ 'Ignored if no merge is required. '
f'(currently supported: {", ".join(sorted(FFmpegMergerPP.SUPPORTED_EXTS))})'))
video_format.add_option(
'--allow-unplayable-formats',