diff options
| author | Lauren N. Liberda <laura@selfisekai.rocks> | 2022-08-04 02:42:12 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-08-04 06:12:12 +0530 |
| commit | fc61aff41beae0063b306dd9d74cc4ff27f0eff7 (patch) | |
| tree | 9207f5e28f69a3b53980653e00ff3c1e927fc27a /yt_dlp/__init__.py | |
| parent | fe0918bb65c828ec81ce904cece58d450c117eba (diff) | |
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/__init__.py')
| -rw-r--r-- | yt_dlp/__init__.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/yt_dlp/__init__.py b/yt_dlp/__init__.py index 4024b6ba1..317dd2623 100644 --- a/yt_dlp/__init__.py +++ b/yt_dlp/__init__.py @@ -228,7 +228,8 @@ def validate_options(opts): validate_regex('format sorting', f, InfoExtractor.FormatSort.regex) # Postprocessor formats - validate_in('merge output format', opts.merge_output_format, FFmpegMergerPP.SUPPORTED_EXTS) + validate_regex('merge output format', opts.merge_output_format, + r'({0})(/({0}))*'.format('|'.join(map(re.escape, FFmpegMergerPP.SUPPORTED_EXTS)))) validate_regex('audio format', opts.audioformat, FFmpegExtractAudioPP.FORMAT_RE) validate_in('subtitle format', opts.convertsubtitles, FFmpegSubtitlesConvertorPP.SUPPORTED_EXTS) validate_regex('thumbnail format', opts.convertthumbnails, FFmpegThumbnailsConvertorPP.FORMAT_RE) |