From 377086af3ddc9cd999225df8bfff5e16670b61eb Mon Sep 17 00:00:00 2001 From: Idan Kamara Date: Fri, 25 Feb 2011 23:19:13 +0200 Subject: [PATCH 1/2] 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 --- youtube-dl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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): From b58faab5e7e10c1b3f52342277098d97365825de Mon Sep 17 00:00:00 2001 From: Ricardo Garcia Date: Sat, 26 Feb 2011 00:47:29 +0100 Subject: [PATCH 2/2] Bump version number --- LATEST_VERSION | 2 +- youtube-dl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 79185b1e7..9a08932b0 100755 --- a/youtube-dl +++ b/youtube-dl @@ -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', )