Merge pull request kkroening#53 from kkroening/fix-starttime0

kkroening · web-flow · commit 0682a3e2b283 · 2018-01-07T23:41:20.000-08:00
Fix issue with input ss=0
diff --git a/ffmpeg/_run.py b/ffmpeg/_run.py
@@ -16,7 +16,7 @@
     get_stream_spec_nodes,
     FilterNode,
     GlobalNode,
-    InputNode,   
+    InputNode,
     OutputNode,
     output_operator,
 )
@@ -31,7 +31,7 @@ def _convert_kwargs_to_cmd_line_args(kwargs):
     for k in sorted(kwargs.keys()):
         v = kwargs[k]
         args.append('-{}'.format(k))
-        if v:
+        if v is not None:
             args.append('{}'.format(v))
     return args
 
diff --git a/ffmpeg/tests/test_ffmpeg.py b/ffmpeg/tests/test_ffmpeg.py
@@ -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():
     out1 = ffmpeg.input('in1.mp4').output('out1.mp4')
     out2 = ffmpeg.input('in2.mp4').output('out2.mp4')
