Browse Source

[ffmpeg] check for - file name in _ffmpeg_filename_argument

totalwebcasting
remitamine 9 years ago
parent
commit
d868f43c58
2 changed files with 2 additions and 5 deletions
  1. +1
    -4
      youtube_dl/downloader/external.py
  2. +1
    -1
      youtube_dl/postprocessor/ffmpeg.py

+ 1
- 4
youtube_dl/downloader/external.py View File

@ -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)


+ 1
- 1
youtube_dl/postprocessor/ffmpeg.py View File

@ -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):


Loading…
Cancel
Save