|
|
@ -225,7 +225,7 @@ class FFmpegFD(ExternalFD):
|
|
|
|
|
|
|
|
|
|
|
|
args += ['-i', url, '-c', 'copy']
|
|
|
|
args += ['-i', url, '-c', 'copy']
|
|
|
|
if protocol == 'm3u8':
|
|
|
|
if protocol == 'm3u8':
|
|
|
|
if self.params.get('hls_use_mpegts', False):
|
|
|
|
if self.params.get('hls_use_mpegts', False) or tmpfilename == '-':
|
|
|
|
args += ['-f', 'mpegts']
|
|
|
|
args += ['-f', 'mpegts']
|
|
|
|
else:
|
|
|
|
else:
|
|
|
|
args += ['-f', 'mp4', '-bsf:a', 'aac_adtstoasc']
|
|
|
|
args += ['-f', 'mp4', '-bsf:a', 'aac_adtstoasc']
|
|
|
@ -235,6 +235,9 @@ class FFmpegFD(ExternalFD):
|
|
|
|
args += ['-f', EXT_TO_OUT_FORMATS.get(info_dict['ext'], info_dict['ext'])]
|
|
|
|
args += ['-f', EXT_TO_OUT_FORMATS.get(info_dict['ext'], info_dict['ext'])]
|
|
|
|
|
|
|
|
|
|
|
|
args = [encodeArgument(opt) for opt in args]
|
|
|
|
args = [encodeArgument(opt) for opt in args]
|
|
|
|
|
|
|
|
if tmpfilename == '-':
|
|
|
|
|
|
|
|
args.append('pipe:1')
|
|
|
|
|
|
|
|
else:
|
|
|
|
args.append(encodeFilename(ffpp._ffmpeg_filename_argument(tmpfilename), True))
|
|
|
|
args.append(encodeFilename(ffpp._ffmpeg_filename_argument(tmpfilename), True))
|
|
|
|
|
|
|
|
|
|
|
|
self._debug_cmd(args)
|
|
|
|
self._debug_cmd(args)
|
|
|
|