Madeorsk/youtube-dl
1
0
Fork 0
mirror of https://codeberg.org/polarisfm/youtube-dl synced 2024-11-26 02:14:32 +01:00
Code Issues Releases Wiki Activity

fix args order in FFmpegFD

Browse Source 
In `ytdl --external-downloader ffmpeg --external-downloader-args '-ss 1 -t 2'`,
youtube-dl will give all the external downloader args to ffmpeg *before* the
input url; but some of them need to be given after the input url.

This patch moves `-t`, `-to`, and `-fs` (if given) to be after the input.
This commit is contained in:
noureddin 2018-05-29 07:29:53 +02:00 committed by GitHub
parent a07879d6b2
commit 71d5459c0b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
youtube_dl/downloader/external.py
View File

@ -233,7 +233,24 @@ class FFmpegFD(ExternalFD):
# http://trac.ffmpeg.org/ticket/6125#comment:10
args += ['-seekable', '1' if seekable else '0']
args += self._configuration_args()
# args += self._configuration_args()
# Some ffmpeg options need to come after the input url.
# `-to` and `-fs` must. `-t` should.
# Also, in ffmpeg, options and values must be separated with a space;
# so, we will never see `-t2` but will see `-t 2`.
self._input_args = self._configuration_args()
self._output_args = []
for opt in ['-t', '-to', '-fs']:
try:
idx = self._input_args.index(opt)
self._output_args.append(self._input_args.pop(idx)) # the option
self._output_args.append(self._input_args.pop(idx)) # the value
except ValueError:
pass
args += self._input_args
# start_time = info_dict.get('start_time') or 0
# if start_time:
@ -295,6 +312,7 @@ class FFmpegFD(ExternalFD):
args += ['-rtmp_live', 'live']
args += ['-i', url, '-c', 'copy']
args += self._output_args
if self.params.get('test', False):
args += ['-fs', compat_str(self._TEST_FILE_SIZE)]