Compare commits

..

No commits in common. "4dcf945a6284a5d350ead373c58377a78252fbd8" and "3f603ae1367312dbad420ad37643b089c12c65eb" have entirely different histories.

2 changed files with 3 additions and 9 deletions

View file

@ -251,8 +251,6 @@ if __name__ == '__main__':
'oshash': clip['streams'][i],
'url': '%s/%s/%sp%s.mp4' % (base_url, clip['item'], stream_resolution, i + 1),
'item': clip['item'],
'item-in': clip['in'],
'item-out': clip['out'],
'annotation': clip.get('annotation'),
'resolution': info['resolution'],
'in': stream_in,

View file

@ -122,7 +122,6 @@ for clip in edit:
]
cmd = [
'ffmpeg',
'-hide_banner',
'-nostats', '-loglevel', 'error',
] + audio + [
'-ss', str(clip['in']),
@ -161,12 +160,9 @@ for clip in edit:
txt = output + '.txt'
with open(txt, 'w') as fd:
fd.write('file ' + '\nfile '.join(files))
cmd = [
'ffmpeg',
'-hide_banner',
cmd = ['ffmpeg',
'-nostats', '-loglevel', 'error',
'-y', '-f', 'concat', '-safe', '0', '-i', txt, '-c', 'copy', output
]
'-y', '-f', 'concat', '-safe', '0', '-i', txt, '-c', 'copy', output]
run(cmd)
os.unlink(txt)