mirrors/youtube-dl
1
0
Fork 0
mirror of https://github.com/ytdl-org/youtube-dl.git synced 2024-12-23 14:52:38 +00:00
Code Issues Projects Releases Wiki Activity

[external/downloader] don't pass -t and -ss to ffmpeg

Browse Source
This commit is contained in:
remitamine 2016-03-13 21:11:19 +01:00
parent 77dea16ac8
commit 694c47b261
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
youtube_dl/downloader/external.py
View File

@ -7,7 +7,6 @@ import re
from .common import FileDownloader from .common import FileDownloader
from ..postprocessor.ffmpeg import FFmpegPostProcessor, EXT_TO_OUT_FORMATS from ..postprocessor.ffmpeg import FFmpegPostProcessor, EXT_TO_OUT_FORMATS
from ..compat import compat_str
from ..utils import ( from ..utils import (
cli_option, cli_option,
cli_valueless_option, cli_valueless_option,
@ -182,12 +181,12 @@ class FFmpegFD(ExternalFD):
args = [ffpp.executable, '-y'] args = [ffpp.executable, '-y']
start_time = info_dict.get('start_time') or 0 # start_time = info_dict.get('start_time') or 0
if start_time: # if start_time:
args += ['-ss', compat_str(start_time)] # args += ['-ss', compat_str(start_time)]
end_time = info_dict.get('end_time') # end_time = info_dict.get('end_time')
if end_time: # if end_time:
args += ['-t', compat_str(end_time - start_time)] # args += ['-t', compat_str(end_time - start_time)]
if info_dict['http_headers'] and re.match(r'^https?://', url): if info_dict['http_headers'] and re.match(r'^https?://', url):
# Trailing \r\n after each HTTP header is important to prevent warning from ffmpeg/avconv: # Trailing \r\n after each HTTP header is important to prevent warning from ffmpeg/avconv: