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

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

Browse Source 
This reverts commit f520618e14ec808f8e0dc507caf633c1663ffa38.
This commit is contained in:
Karl Kroening 2017-05-25 15:45:15 -10:00
parent 56102041aa
commit 7adc3dff5b
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ffmpeg/__init__.py
View File

@ -216,7 +216,7 @@ class _OutputNode(_Node):
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

2
ffmpeg/tests/test_ffmpeg.py
View File

@ -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];' \