fix som youku mp4 real flv,twitter mp4 real ts

This commit is contained in:
xsker 2018-03-10 14:36:13 +08:00
parent 1900f7608c
commit 5b02bce500

View File

@ -972,9 +972,17 @@ def download_urls(
from .processor.ffmpeg import ffmpeg_concat_mp4_to_mp4 from .processor.ffmpeg import ffmpeg_concat_mp4_to_mp4
ffmpeg_concat_mp4_to_mp4(parts, output_filepath) ffmpeg_concat_mp4_to_mp4(parts, output_filepath)
else: else:
from .processor.join_mp4 import concat_mp4 print('Merged into %s' % output_filename)
concat_mp4(parts, output_filepath) try:
print('Merged into %s' % output_filename) from .processor.join_mp4 import concat_mp4
concat_mp4(parts, output_filepath)
except:
try:
from .processor.join_flv import concat_flv
concat_flv(parts, output_filepath)
except:
from .processor.join_ts import concat_ts
concat_ts(parts, output_filepath)
except: except:
raise raise
else: else: