mirror of
https://github.com/ytdl-org/youtube-dl
synced 2024-08-20 19:30:28 +02:00
Merge branch 'master' into vimeo
This commit is contained in:
commit
d8edbf3a93
@ -1 +1 @@
|
|||||||
2011.02.25b
|
2011.02.25c
|
||||||
|
@ -2737,7 +2737,7 @@ class FFmpegExtractAudioPP(PostProcessor):
|
|||||||
@staticmethod
|
@staticmethod
|
||||||
def get_audio_codec(path):
|
def get_audio_codec(path):
|
||||||
try:
|
try:
|
||||||
handle = subprocess.Popen(['ffprobe', '-show_streams', path],
|
handle = subprocess.Popen(['ffprobe', '-show_streams', '--', path],
|
||||||
stderr=file(os.path.devnull, 'w'), stdout=subprocess.PIPE)
|
stderr=file(os.path.devnull, 'w'), stdout=subprocess.PIPE)
|
||||||
output = handle.communicate()[0]
|
output = handle.communicate()[0]
|
||||||
if handle.wait() != 0:
|
if handle.wait() != 0:
|
||||||
@ -2755,7 +2755,7 @@ class FFmpegExtractAudioPP(PostProcessor):
|
|||||||
@staticmethod
|
@staticmethod
|
||||||
def run_ffmpeg(path, out_path, codec, more_opts):
|
def run_ffmpeg(path, out_path, codec, more_opts):
|
||||||
try:
|
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)
|
stdout=file(os.path.devnull, 'w'), stderr=subprocess.STDOUT)
|
||||||
return (ret == 0)
|
return (ret == 0)
|
||||||
except (IOError, OSError):
|
except (IOError, OSError):
|
||||||
@ -2840,7 +2840,7 @@ if __name__ == '__main__':
|
|||||||
# Parse command line
|
# Parse command line
|
||||||
parser = optparse.OptionParser(
|
parser = optparse.OptionParser(
|
||||||
usage='Usage: %prog [options] url...',
|
usage='Usage: %prog [options] url...',
|
||||||
version='2011.02.25b',
|
version='2011.02.25c',
|
||||||
conflict_handler='resolve',
|
conflict_handler='resolve',
|
||||||
)
|
)
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user