From: Rogério Brito <rbrito@ime.usp.br>
Date: Sat, 26 Feb 2011 13:09:18 +0000 (-0300)
Subject: Merge branch 'master' into prefer-webm
X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=a62db07f58675699c17aa1b00beca55ff1f42489;hp=854cad639eb15241fac85799277d49a94a83a099;p=youtube-dl

Merge branch 'master' into prefer-webm
---

diff --git a/LATEST_VERSION b/LATEST_VERSION
index 4851877b4..42b22d923 100644
--- a/LATEST_VERSION
+++ b/LATEST_VERSION
@@ -1 +1 @@
-2011.02.25b
+2011.02.25c
diff --git a/youtube-dl b/youtube-dl
index af6522bac..0c1209a04 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):
@@ -2723,7 +2723,7 @@ if __name__ == '__main__':
 		# Parse command line
 		parser = optparse.OptionParser(
 			usage='Usage: %prog [options] url...',
-			version='2011.02.25b',
+			version='2011.02.25c',
 			conflict_handler='resolve',
 		)