mirror of
https://github.com/soimort/you-get.git
synced 2025-02-11 20:52:31 +03:00
Merge branch 'develop' into patch-1
This commit is contained in:
commit
b7299a0ed5
@ -58,7 +58,7 @@ def ffmpeg_concat_mp4_to_mpg(files, output='output.mpg'):
|
|||||||
concat_list.close()
|
concat_list.close()
|
||||||
|
|
||||||
params = [FFMPEG] + LOGLEVEL
|
params = [FFMPEG] + LOGLEVEL
|
||||||
params.extend(['-f', 'concat', '-y', '-i'])
|
params.extend(['-f', 'concat', '-safe', '-1', '-y', '-i'])
|
||||||
params.append(output + '.txt')
|
params.append(output + '.txt')
|
||||||
params += ['-c', 'copy', output]
|
params += ['-c', 'copy', output]
|
||||||
|
|
||||||
@ -122,7 +122,7 @@ def ffmpeg_concat_flv_to_mp4(files, output='output.mp4'):
|
|||||||
concat_list.write("file %s\n" % parameterize(file))
|
concat_list.write("file %s\n" % parameterize(file))
|
||||||
concat_list.close()
|
concat_list.close()
|
||||||
|
|
||||||
params = [FFMPEG] + LOGLEVEL + ['-f', 'concat', '-y', '-i']
|
params = [FFMPEG] + LOGLEVEL + ['-f', 'concat', '-safe', '-1', '-y', '-i']
|
||||||
params.append(output + '.txt')
|
params.append(output + '.txt')
|
||||||
params += ['-c', 'copy', output]
|
params += ['-c', 'copy', output]
|
||||||
|
|
||||||
@ -167,7 +167,7 @@ def ffmpeg_concat_mp4_to_mp4(files, output='output.mp4'):
|
|||||||
concat_list.write("file %s\n" % parameterize(file))
|
concat_list.write("file %s\n" % parameterize(file))
|
||||||
concat_list.close()
|
concat_list.close()
|
||||||
|
|
||||||
params = [FFMPEG] + LOGLEVEL + ['-f', 'concat', '-y', '-i']
|
params = [FFMPEG] + LOGLEVEL + ['-f', 'concat', '-safe', '-1', '-y', '-i']
|
||||||
params.append(output + '.txt')
|
params.append(output + '.txt')
|
||||||
params += ['-c', 'copy', output]
|
params += ['-c', 'copy', output]
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user