瀏覽代碼

[ffmpeg] check for - file name in _ffmpeg_filename_argument

remitamine 9 年之前
父節點
當前提交
d868f43c58
共有 2 個文件被更改,包括 2 次插入5 次删除
  1. 1 4
      youtube_dl/downloader/external.py
  2. 1 1
      youtube_dl/postprocessor/ffmpeg.py

+ 1 - 4
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)
 

+ 1 - 1
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):