aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIdan Kamara <idankk86@gmail.com>2011-02-25 23:19:13 +0200
committerIdan Kamara <idankk86@gmail.com>2011-02-25 23:24:58 +0200
commit377086af3ddc9cd999225df8bfff5e16670b61eb (patch)
tree427a60a8e933b246a1ee3fddbb7c052738c018d3
parent820eedcb504acb9666ed589c3ed8cb1a641d0fd1 (diff)
downloadyoutube-dl-377086af3ddc9cd999225df8bfff5e16670b61eb.tar.xz
Use '--' to separate the file argument from the options when calling ffmpeg
This is to avoid a potential issue if the file name begins with a hyphen since ffmpeg will interpret it as an option
-rwxr-xr-xyoutube-dl4
1 files changed, 2 insertions, 2 deletions
diff --git a/youtube-dl b/youtube-dl
index 072a91970..79185b1e7 100755
--- a/youtube-dl
+++ b/youtube-dl
@@ -2620,7 +2620,7 @@ class FFmpegExtractAudioPP(PostProcessor):
@staticmethod
def get_audio_codec(path):
try:
- handle = subprocess.Popen(['ffprobe', '-show_streams', path],
+ handle = subprocess.Popen(['ffprobe', '-show_streams', '--', path],
stderr=file(os.path.devnull, 'w'), stdout=subprocess.PIPE)
output = handle.communicate()[0]
if handle.wait() != 0:
@@ -2638,7 +2638,7 @@ class FFmpegExtractAudioPP(PostProcessor):
@staticmethod
def run_ffmpeg(path, out_path, codec, more_opts):
try:
- ret = subprocess.call(['ffmpeg', '-y', '-i', path, '-vn', '-acodec', codec] + more_opts + [out_path],
+ ret = subprocess.call(['ffmpeg', '-y', '-i', path, '-vn', '-acodec', codec] + more_opts + ['--', out_path],
stdout=file(os.path.devnull, 'w'), stderr=subprocess.STDOUT)
return (ret == 0)
except (IOError, OSError):