Merge remote-tracking branch 'origin/master'

README.md

@@ -95,6 +95,10 @@ $ python
 >>> import ffmpeg
 ```
 
+## [Examples](https://github.com/kkroening/ffmpeg-python/tree/master/examples)
+
+When in doubt, take a look at the [examples](https://github.com/kkroening/ffmpeg-python/tree/master/examples) to see if there's something that's close to whatever you're trying to do.
+
 ## [API Reference](https://kkroening.github.io/ffmpeg-python/)
 
 API documentation is automatically generated from python docstrings and hosted on github pages: https://kkroening.github.io/ffmpeg-python/

ffmpeg/_run.py

@@ -1,10 +1,9 @@
 from __future__ import unicode_literals
-
 from .dag import get_outgoing_edges, topo_sort
 from ._utils import basestring
 from builtins import str
 from functools import reduce
-from past.builtins import basestring
+import collections
 import copy
 import operator
 import subprocess
@@ -123,6 +122,11 @@ def _get_output_args(node, stream_name_map):
     fmt = kwargs.pop('format', None)
     if fmt:
         args += ['-f', fmt]
+    if 'video_size' in kwargs:
+        video_size = kwargs.pop('video_size')
+        if not isinstance(video_size, basestring) and isinstance(video_size, collections.Iterable):
+            video_size = '{}x{}'.format(video_size[0], video_size[1])
+        args += ['-video_size', video_size]
     args += _convert_kwargs_to_cmd_line_args(kwargs)
     args += [filename]
     return args

ffmpeg/tests/test_ffmpeg.py

@@ -237,6 +237,17 @@ def test_filter_asplit():
     ]
 
 
+@pytest.mark.parametrize('video_size', [(320, 240), '320x240'])
+def test__output__video_size(video_size):
+    args = (
+        ffmpeg
+        .input('in')
+        .output('out', video_size=video_size)
+        .get_args()
+    )
+    assert args == ['-i', 'in', '-video_size', '320x240', 'out']
+
+
 def test_filter_normal_arg_escape():
     """Test string escaping of normal filter args (e.g. ``font`` param of ``drawtext`` filter)."""
     def _get_drawtext_font_repr(font):