Revert "kkroening#4: use -vf instead of -filter_complex"

kkroening · kkroening · commit 7adc3dff5b05 · 2017-05-25T15:45:15.000-10:00
This reverts commit f520618.
diff --git a/ffmpeg/__init__.py b/ffmpeg/__init__.py
@@ -216,7 +216,7 @@ def get_args(self):
         filter_arg = self._get_filter_arg(filter_nodes, stream_name_map)
         args += reduce(operator.add, [self._get_input_args(node) for node in input_nodes])
         if filter_arg:
-            args += ['-vf', filter_arg]
+            args += ['-filter_complex', filter_arg]
         args += reduce(operator.add, [self._get_output_args(node, stream_name_map) for node in output_nodes])
         args += reduce(operator.add, [self._get_global_args(node) for node in global_nodes], [])
         return args
diff --git a/ffmpeg/tests/test_ffmpeg.py b/ffmpeg/tests/test_ffmpeg.py
@@ -102,7 +102,7 @@ def test_get_args_complex_filter():
     assert args == [
         '-i', TEST_INPUT_FILE,
         '-i', TEST_OVERLAY_FILE,
-        '-vf',
+        '-filter_complex',
             '[0]trim=start_frame=10:end_frame=20,setpts=PTS-STARTPTS[v0];' \
             '[0]trim=start_frame=30:end_frame=40,setpts=PTS-STARTPTS[v1];' \
             '[v0][v1]concat=n=2[v2];' \
