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

Merge branch 'feature/17' into feature/18

Browse Source
This commit is contained in:
Karl Kroening 2017-07-12 02:10:51 -06:00
commit 0d60de3fe9
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ffmpeg/_run.py
View File

@ -67,7 +67,7 @@ def _allocate_filter_stream_names(filter_nodes, outgoing_edge_maps, stream_name_
stream_count = 0
for upstream_node in filter_nodes:
outgoing_edge_map = outgoing_edge_maps[upstream_node]
for upstream_label, downstreams in outgoing_edge_map.items():
for upstream_label, downstreams in list(outgoing_edge_map.items()):
if len(downstreams) > 1:
# TODO: automatically insert `splits` ahead of time via graph transformation.
raise ValueError('Encountered {} with multiple outgoing edges with same upstream label {!r}; a '

4
ffmpeg/nodes.py
View File

@ -54,7 +54,7 @@ def get_stream_map(stream_spec):
def get_stream_map_nodes(stream_map):
nodes = []
for stream in stream_map.values():
for stream in list(stream_map.values()):
if not isinstance(stream, Stream):
raise TypeError('Expected Stream; got {}'.format(type(stream)))
nodes.append(stream.node)
@ -157,7 +157,7 @@ class FilterNode(Node):
out_args = [escape_chars(x, '\\\'=:') for x in args]
out_kwargs = {}
for k, v in kwargs.items():
for k, v in list(kwargs.items()):
k = escape_chars(k, '\\\'=:')
v = escape_chars(v, '\\\'=:')
out_kwargs[k] = v

6
ffmpeg/tests/test_ffmpeg.py
View File

@ -1,5 +1,7 @@
from __future__ import unicode_literals
from builtins import bytes
from builtins import range
import ffmpeg
import os
import pytest
@ -171,7 +173,7 @@ def test_filter_normal_arg_escape():
'=': 2,
'\n': 0,
}
for ch, expected_backslash_count in expected_backslash_counts.items():
for ch, expected_backslash_count in list(expected_backslash_counts.items()):
expected = '{}{}'.format('\\' * expected_backslash_count, ch)
actual = _get_drawtext_font_repr(ch)
assert expected == actual
@ -205,7 +207,7 @@ def test_filter_text_arg_str_escape():
'=': 2,
'\n': 0,
}
for ch, expected_backslash_count in expected_backslash_counts.items():
for ch, expected_backslash_count in list(expected_backslash_counts.items()):
expected = '{}{}'.format('\\' * expected_backslash_count, ch)
actual = _get_drawtext_text_repr(ch)
assert expected == actual