From ce599d5a7edf2161d0881ccd263131d51c656093 Mon Sep 17 00:00:00 2001 From: remitamine Date: Thu, 14 Apr 2016 18:48:00 +0100 Subject: [downloader/external] enable piping for FFmpegFD(closes #2124) --- youtube_dl/downloader/external.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'youtube_dl/downloader/external.py') diff --git a/youtube_dl/downloader/external.py b/youtube_dl/downloader/external.py index 30277dc20..cda39fe97 100644 --- a/youtube_dl/downloader/external.py +++ b/youtube_dl/downloader/external.py @@ -225,7 +225,7 @@ class FFmpegFD(ExternalFD): args += ['-i', url, '-c', 'copy'] if protocol == 'm3u8': - if self.params.get('hls_use_mpegts', False): + if self.params.get('hls_use_mpegts', False) or tmpfilename == '-': args += ['-f', 'mpegts'] else: args += ['-f', 'mp4', '-bsf:a', 'aac_adtstoasc'] @@ -235,7 +235,10 @@ class FFmpegFD(ExternalFD): args += ['-f', EXT_TO_OUT_FORMATS.get(info_dict['ext'], info_dict['ext'])] args = [encodeArgument(opt) for opt in args] - args.append(encodeFilename(ffpp._ffmpeg_filename_argument(tmpfilename), True)) + if tmpfilename == '-': + args.append('pipe:1') + else: + args.append(encodeFilename(ffpp._ffmpeg_filename_argument(tmpfilename), True)) self._debug_cmd(args) -- cgit v1.2.3 From d868f43c588b9929208823e86c12669d69e4e2cd Mon Sep 17 00:00:00 2001 From: remitamine Date: Sat, 16 Apr 2016 19:45:56 +0100 Subject: [ffmpeg] check for - file name in _ffmpeg_filename_argument --- youtube_dl/downloader/external.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'youtube_dl/downloader/external.py') diff --git a/youtube_dl/downloader/external.py b/youtube_dl/downloader/external.py index cda39fe97..8d642fc3e 100644 --- a/youtube_dl/downloader/external.py +++ b/youtube_dl/downloader/external.py @@ -235,10 +235,7 @@ class FFmpegFD(ExternalFD): args += ['-f', EXT_TO_OUT_FORMATS.get(info_dict['ext'], info_dict['ext'])] args = [encodeArgument(opt) for opt in args] - if tmpfilename == '-': - args.append('pipe:1') - else: - args.append(encodeFilename(ffpp._ffmpeg_filename_argument(tmpfilename), True)) + args.append(encodeFilename(ffpp._ffmpeg_filename_argument(tmpfilename), True)) self._debug_cmd(args) -- cgit v1.2.3