Merge branch 'lilydjwg-develop' into develop

This commit is contained in:
Mort Yao 2015-09-27 20:22:31 +02:00
commit e49c46a25f

View File

@ -109,11 +109,9 @@ def ffmpeg_concat_flv_to_mp4(files, output='output.mp4'):
params.append(output + '.txt') params.append(output + '.txt')
params += ['-c', 'copy', output] params += ['-c', 'copy', output]
if subprocess.call(params) == 0: subprocess.check_call(params)
os.remove(output + '.txt') os.remove(output + '.txt')
return True return True
else:
raise
for file in files: for file in files:
if os.path.isfile(file): if os.path.isfile(file):