Merge branch 'master' into prefer-webm

diff --combined youtube-dl
index af6522bacf176c3428036082223444c86864c45d,9a08932b0a798b4b40a367c3a42d3f8f9b72c8ac..0c1209a04e88c5e5c7f861c8a46f44dbf9f7cada
--- 1/youtube-dl
--- 2/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',
                )