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

Merge pull request #286 from cmehay/duplicate_parameters

Browse Source 
Duplicate parameters can be set in kwargs with an iterator
This commit is contained in:
Karl Kroening 2019-11-02 01:46:20 -05:00 committed by GitHub
commit 24633404df
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ffmpeg/_utils.py
View File

@ -3,6 +3,8 @@ from builtins import str
from past.builtins import basestring
import hashlib
import sys
import collections
if sys.version_info.major == 2:
# noinspection PyUnresolvedReferences,PyShadowingBuiltins
@ -91,6 +93,12 @@ def convert_kwargs_to_cmd_line_args(kwargs):
args = []
for k in sorted(kwargs.keys()):
v = kwargs[k]
if isinstance(v, collections.Iterable) and not isinstance(v, str):
for value in v:
args.append('-{}'.format(k))
if value is not None:
args.append('{}'.format(value))
continue
args.append('-{}'.format(k))
if v is not None:
args.append('{}'.format(v))

5
ffmpeg/tests/test_ffmpeg.py
View File

@ -9,6 +9,7 @@ import random
import re
import subprocess
try:
import mock # python 2
except ImportError:
@ -114,6 +115,10 @@ def test_stream_repr():
dummy_out.label, dummy_out.node.short_hash
)
def test_repeated_args():
out_file = ffmpeg.input('dummy.mp4').output('dummy2.mp4', streamid=['0:0x101', '1:0x102'])
assert out_file.get_args() == ['-i', 'dummy.mp4', '-streamid', '0:0x101', '-streamid', '1:0x102', 'dummy2.mp4']
def test__get_args__simple():
out_file = ffmpeg.input('dummy.mp4').output('dummy2.mp4')