|
|
@ -13,6 +13,7 @@ from .cookies import SUPPORTED_BROWSERS, SUPPORTED_KEYRINGS
|
|
|
|
from .downloader.external import list_external_downloaders
|
|
|
|
from .downloader.external import list_external_downloaders
|
|
|
|
from .postprocessor import (
|
|
|
|
from .postprocessor import (
|
|
|
|
FFmpegExtractAudioPP,
|
|
|
|
FFmpegExtractAudioPP,
|
|
|
|
|
|
|
|
FFmpegMergerPP,
|
|
|
|
FFmpegSubtitlesConvertorPP,
|
|
|
|
FFmpegSubtitlesConvertorPP,
|
|
|
|
FFmpegThumbnailsConvertorPP,
|
|
|
|
FFmpegThumbnailsConvertorPP,
|
|
|
|
FFmpegVideoRemuxerPP,
|
|
|
|
FFmpegVideoRemuxerPP,
|
|
|
@ -781,9 +782,8 @@ def create_parser():
|
|
|
|
'--merge-output-format',
|
|
|
|
'--merge-output-format',
|
|
|
|
action='store', dest='merge_output_format', metavar='FORMAT', default=None,
|
|
|
|
action='store', dest='merge_output_format', metavar='FORMAT', default=None,
|
|
|
|
help=(
|
|
|
|
help=(
|
|
|
|
'If a merge is required (e.g. bestvideo+bestaudio), '
|
|
|
|
'Container to use when merging formats (e.g. bestvideo+bestaudio). Ignored if no merge is required. '
|
|
|
|
'output to given container format. One of mkv, mp4, ogg, webm, flv. '
|
|
|
|
f'(currently supported: {", ".join(sorted(FFmpegMergerPP.SUPPORTED_EXTS))})'))
|
|
|
|
'Ignored if no merge is required'))
|
|
|
|
|
|
|
|
video_format.add_option(
|
|
|
|
video_format.add_option(
|
|
|
|
'--allow-unplayable-formats',
|
|
|
|
'--allow-unplayable-formats',
|
|
|
|
action='store_true', dest='allow_unplayable_formats', default=False,
|
|
|
|
action='store_true', dest='allow_unplayable_formats', default=False,
|
|
|
|