From: Idan Kamara <idankk86@gmail.com>
Date: Fri, 25 Feb 2011 21:19:13 +0000 (+0200)
Subject: Use '--' to separate the file argument from the options when calling ffmpeg
X-Git-Url: http://git.oshgnacknak.de/?a=commitdiff_plain;h=377086af3ddc9cd999225df8bfff5e16670b61eb;p=youtube-dl

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

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