diff options
| author | Rogério Brito <rbrito@ime.usp.br> | 2011-02-26 10:09:18 -0300 |
|---|---|---|
| committer | Rogério Brito <rbrito@ime.usp.br> | 2011-02-26 10:09:18 -0300 |
| commit | a62db07f58675699c17aa1b00beca55ff1f42489 (patch) | |
| tree | e99e83cef16fce7e878157598c90588aeec16004 | |
| parent | 854cad639eb15241fac85799277d49a94a83a099 (diff) | |
| parent | b58faab5e7e10c1b3f52342277098d97365825de (diff) | |
Merge branch 'master' into prefer-webm
| -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 af6522bac..0c1209a04 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): @@ -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', ) |