Merge branch 'master' into prefer-webm

[youtube-dl] / youtube-dl

diff --git a/youtube-dl b/youtube-dl
index af6522bacf176c3428036082223444c86864c45d..0c1209a04e88c5e5c7f861c8a46f44dbf9f7cada 100755 (executable)
--- 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',
                )