PublicMirrors/you-get
1
0
Fork 0
mirror of https://github.com/soimort/you-get.git synced 2025-02-03 00:33:58 +03:00
Code Issues Actions Packages Projects Releases 1 Wiki Activity

Merge branch 'ffmpeg-check-call' of https://github.com/lilydjwg/you-get into lilydjwg-ffmpeg-check-call

Browse Source
This commit is contained in:
Mort Yao 2016-01-24 03:45:42 +01:00
commit 446f90f559
1 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/you_get/processor/ffmpeg.py
View File

@ -170,11 +170,9 @@ def ffmpeg_concat_mp4_to_mp4(files, output='output.mp4'):
params.append(output + '.txt')
params += ['-c', 'copy', output]
if subprocess.call(params) == 0:
os.remove(output + '.txt')
return True
else:
raise
subprocess.check_call(params)
os.remove(output + '.txt')
return True
for file in files:
if os.path.isfile(file):
@ -196,9 +194,7 @@ def ffmpeg_concat_mp4_to_mp4(files, output='output.mp4'):
else:
params += ['-c', 'copy', '-absf', 'aac_adtstoasc', output]
if subprocess.call(params) == 0:
for file in files:
os.remove(file + '.ts')
return True
else:
raise
subprocess.check_call(params)
for file in files:
os.remove(file + '.ts')
return True