blackteay/ffmpeg-python
1
0
Fork 0
mirror of https://github.com/kkroening/ffmpeg-python.git synced 2025-04-06 04:15:44 +08:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into extra-examples

Browse Source
This commit is contained in:
Karl Kroening 2018-01-07 23:45:34 -08:00
commit c72c86e82f
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ffmpeg/_run.py
View File

@ -16,7 +16,7 @@ from .nodes import (
get_stream_spec_nodes, get_stream_spec_nodes,
FilterNode, FilterNode,
GlobalNode, GlobalNode,
InputNode, InputNode,
OutputNode, OutputNode,
output_operator, output_operator,
) )
@ -31,7 +31,7 @@ def _convert_kwargs_to_cmd_line_args(kwargs):
for k in sorted(kwargs.keys()): for k in sorted(kwargs.keys()):
v = kwargs[k] v = kwargs[k]
args.append('-{}'.format(k)) args.append('-{}'.format(k))
if v: if v is not None:
args.append('{}'.format(v)) args.append('{}'.format(v))
return args return args

5
ffmpeg/tests/test_ffmpeg.py
View File

@ -291,6 +291,11 @@ def test_merge_outputs():
] ]
def test__input__start_time():
assert ffmpeg.input('in', ss=10.5).output('out').get_args() == ['-ss', '10.5', '-i', 'in', 'out']
assert ffmpeg.input('in', ss=0.0).output('out').get_args() == ['-ss', '0.0', '-i', 'in', 'out']
def test_multi_passthrough(): def test_multi_passthrough():
out1 = ffmpeg.input('in1.mp4').output('out1.mp4') out1 = ffmpeg.input('in1.mp4').output('out1.mp4')
out2 = ffmpeg.input('in2.mp4').output('out2.mp4') out2 = ffmpeg.input('in2.mp4').output('out2.mp4')