diff options
| author | Rogério Brito <rbrito@ime.usp.br> | 2011-02-26 10:09:36 -0300 |
|---|---|---|
| committer | Rogério Brito <rbrito@ime.usp.br> | 2011-02-26 10:09:36 -0300 |
| commit | d8edbf3a937a15fa390986f2fc30283dcbcb495f (patch) | |
| tree | 9be760f72c9d7e4c4fc0e3be4fde9792c1b96449 | |
| parent | cb25a0e30c27f8735deac20eec213101e0c5e29c (diff) | |
| parent | b58faab5e7e10c1b3f52342277098d97365825de (diff) | |
| download | youtube-dl-d8edbf3a937a15fa390986f2fc30283dcbcb495f.tar.xz | |
Merge branch 'master' into vimeo
| -rw-r--r-- | LATEST_VERSION | 2 | ||||
| -rwxr-xr-x | youtube-dl | 6 |
2 files changed, 4 insertions, 4 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 9ce89aaf0..5ddd02fa6 100755 --- a/youtube-dl +++ b/youtube-dl @@ -2737,7 +2737,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: @@ -2755,7 +2755,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): @@ -2840,7 +2840,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', ) |