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=-c;p=youtube-dl

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

a62db07f58675699c17aa1b00beca55ff1f42489
diff --combined youtube-dl
index af6522bac,9a08932b0..0c1209a04
--- a/youtube-dl
+++ b/youtube-dl
@@@ -864,7 -864,7 +864,7 @@@ class YoutubeIE(InfoExtractor)
  	_AGE_URL = 'http://www.youtube.com/verify_age?next_url=/&gl=US&hl=en'
  	_NETRC_MACHINE = 'youtube'
  	# Listed in order of quality
 -	_available_formats = ['38', '37', '22', '45', '35', '34', '43', '18', '6', '5', '17', '13']
 +	_available_formats = ['38', '37', '45', '22', '43', '35', '34', '18', '6', '5', '17', '13']
  	_video_extensions = {
  		'13': '3gp',
  		'17': 'mp4',
@@@ -2620,7 -2620,7 +2620,7 @@@ class FFmpegExtractAudioPP(PostProcesso
  	@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 +2638,7 @@@
  	@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 +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',
  		)