mirror of
https://github.com/yt-dlp/yt-dlp.git
synced 2024-09-04 05:25:11 +02:00
Use avconv for downloading with m3u8 manifests if it's available (fixes #1735)
This commit is contained in:
parent
0ed05a1d2d
commit
801dbbdffd
@ -381,16 +381,20 @@ def _download_m3u8_with_ffmpeg(self, filename, url):
|
|||||||
self.report_destination(filename)
|
self.report_destination(filename)
|
||||||
tmpfilename = self.temp_name(filename)
|
tmpfilename = self.temp_name(filename)
|
||||||
|
|
||||||
args = ['ffmpeg', '-y', '-i', url, '-f', 'mp4', '-c', 'copy',
|
args = ['-y', '-i', url, '-f', 'mp4', '-c', 'copy',
|
||||||
'-absf', 'aac_adtstoasc', tmpfilename]
|
'-bsf:a', 'aac_adtstoasc', tmpfilename]
|
||||||
# Check for ffmpeg first
|
|
||||||
try:
|
|
||||||
subprocess.call(['ffmpeg', '-h'], stdout=(open(os.path.devnull, 'w')), stderr=subprocess.STDOUT)
|
|
||||||
except (OSError, IOError):
|
|
||||||
self.report_error(u'm3u8 download detected but "%s" could not be run' % args[0] )
|
|
||||||
return False
|
|
||||||
|
|
||||||
retval = subprocess.call(args)
|
for program in ['avconv', 'ffmpeg']:
|
||||||
|
try:
|
||||||
|
subprocess.call([program, '-version'], stdout=(open(os.path.devnull, 'w')), stderr=subprocess.STDOUT)
|
||||||
|
break
|
||||||
|
except (OSError, IOError):
|
||||||
|
pass
|
||||||
|
else:
|
||||||
|
self.report_error(u'm3u8 download detected but ffmpeg or avconv could not be found')
|
||||||
|
cmd = [program] + args
|
||||||
|
|
||||||
|
retval = subprocess.call(cmd)
|
||||||
if retval == 0:
|
if retval == 0:
|
||||||
fsize = os.path.getsize(encodeFilename(tmpfilename))
|
fsize = os.path.getsize(encodeFilename(tmpfilename))
|
||||||
self.to_screen(u'\r[%s] %s bytes' % (args[0], fsize))
|
self.to_screen(u'\r[%s] %s bytes' % (args[0], fsize))
|
||||||
|
Loading…
Reference in New Issue
Block a user