mirror of
https://github.com/soimort/you-get.git
synced 2025-02-03 00:33:58 +03:00
Merge branch 'develop' of https://github.com/ifui/you-get into ifui-develop
This commit is contained in:
commit
393597ef03
@ -175,7 +175,7 @@ def ffmpeg_concat_flv_to_mp4(files, output='output.mp4'):
|
|||||||
if FFMPEG == 'avconv':
|
if FFMPEG == 'avconv':
|
||||||
params += ['-c', 'copy']
|
params += ['-c', 'copy']
|
||||||
else:
|
else:
|
||||||
params += ['-c', 'copy', '-absf', 'aac_adtstoasc']
|
params += ['-c', 'copy', '-bsf:a', 'aac_adtstoasc']
|
||||||
params.extend(['--', output])
|
params.extend(['--', output])
|
||||||
|
|
||||||
if subprocess.call(params, stdin=STDIN) == 0:
|
if subprocess.call(params, stdin=STDIN) == 0:
|
||||||
@ -229,7 +229,7 @@ def ffmpeg_concat_mp4_to_mp4(files, output='output.mp4'):
|
|||||||
if FFMPEG == 'avconv':
|
if FFMPEG == 'avconv':
|
||||||
params += ['-c', 'copy']
|
params += ['-c', 'copy']
|
||||||
else:
|
else:
|
||||||
params += ['-c', 'copy', '-absf', 'aac_adtstoasc']
|
params += ['-c', 'copy', '-bsf:a', 'aac_adtstoasc']
|
||||||
params.extend(['--', output])
|
params.extend(['--', output])
|
||||||
|
|
||||||
subprocess.check_call(params, stdin=STDIN)
|
subprocess.check_call(params, stdin=STDIN)
|
||||||
|
Loading…
Reference in New Issue
Block a user