diff options
| author | remitamine <remitamine@gmail.com> | 2016-04-16 19:45:56 +0100 |
|---|---|---|
| committer | remitamine <remitamine@gmail.com> | 2016-04-16 19:45:56 +0100 |
| commit | d868f43c588b9929208823e86c12669d69e4e2cd (patch) | |
| tree | 566fd59aaaa2ec9df28bf8faaaeace1a9f6b7c30 | |
| parent | ce599d5a7edf2161d0881ccd263131d51c656093 (diff) | |
[ffmpeg] check for - file name in _ffmpeg_filename_argument
| -rw-r--r-- | youtube_dl/downloader/external.py | 5 | ||||
| -rw-r--r-- | youtube_dl/postprocessor/ffmpeg.py | 2 |
2 files changed, 2 insertions, 5 deletions
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) diff --git a/youtube_dl/postprocessor/ffmpeg.py b/youtube_dl/postprocessor/ffmpeg.py index b64cd396b..30af6eb5a 100644 --- a/youtube_dl/postprocessor/ffmpeg.py +++ b/youtube_dl/postprocessor/ffmpeg.py @@ -175,7 +175,7 @@ class FFmpegPostProcessor(PostProcessor): # Always use 'file:' because the filename may contain ':' (ffmpeg # interprets that as a protocol) or can start with '-' (-- is broken in # ffmpeg, see https://ffmpeg.org/trac/ffmpeg/ticket/2127 for details) - return 'file:' + fn + return 'file:' + fn if fn != '-' else fn class FFmpegExtractAudioPP(FFmpegPostProcessor): |