1
0
mirror of https://github.com/kkroening/ffmpeg-python.git synced 2025-04-06 04:15:44 +08:00

13 Commits

Author SHA1 Message Date
Karthikeyan Singaravelan
6189cd6861
Import ABC from collections.abc for Python 3.9+ compatibility ()
* Import ABC from collections.abc instead of collections for Python 3.9 compatibility.

* Fix deprecation warnings due to invalid escape sequences.

* Support Python 3.10

Co-authored-by: Karl Kroening <karlk@kralnet.us>
2022-03-07 01:46:52 -08:00
Karl Kroening
29b6f09298
Use GitHub Actions for CI. ()
This sets up GitHub Actions (GHA) to run in place of the
currently broken Travis CI.  Initially, this only covers running
tox/pytest and Black, but may eventually be extended to run pylint,
mypy, flake8, etc. - see , for example.

Notes:
* Python 3.10 is not yet supported due to the `collections.Iterable`
  issue discussed in , , etc.
* The Black CI step acts as a linting step, rather than attempting to
  have the GHA job automatically update/commit/push the reformarted
  code.
* Black is currently pinned to an older version that supports
  `--target-version py27` until Python 2 compatibility can be dropped in
  the final Python 2 compatibility release of ffmpeg-python.
* Only the main source directory (`ffmpeg/`) is checked with Black at
  the moment.  The `examples/` directory should also be checked, but
  will be done as a separate PR.

Co-authored by: Christian Clauss <cclauss@me.com>
2022-03-07 00:05:43 -08:00
Karl Kroening
fd1da13f11
Re-apply Black formatting, and wrap docstrings at ~88 columns. () 2022-03-06 13:24:40 -08:00
Christophe Mehay
2a7a2d78c9 Duplicate parameters can be set in kwargs with an iterator
For instance, add multiple `streamid` in the output can be done like this:
ffmpeg.input(url).output('video.mp4', streamid=['0:0x101', '1:0x102'])

will output this command line
ffmpeg -i video.mp4 -streamid 0:0x101 -streamid 1:0x102 video.mp4
2019-10-31 12:09:47 +01:00
Karl Kroening
8ea0f4ca4b Use Black formatter 2019-06-03 04:03:37 -05:00
Andrey Kolpakov
3ddc5f04bf Ability to accept extra arguments for ffmpeg.probe command (Issue ) 2019-04-11 10:52:26 +02:00
Karl Kroening
84355d419c : re-futurize 2018-05-09 03:15:12 -05:00
Davide Depau
df9bd7316f
Replace past.builtins.basestring with a custom one to workaround bug in Ubuntu's Python3 2018-01-09 16:04:33 +01:00
Karl Kroening
7b2d8b63fc Merge remote-tracking branch 'origin/master' into feature/17
Conflicts:
	ffmpeg/_filters.py
	ffmpeg/_utils.py
	ffmpeg/nodes.py
	ffmpeg/tests/test_ffmpeg.py
2017-07-12 02:08:19 -06:00
Karl Kroening
c19dcaca30 Fix drawbox=>drawtext 2017-07-12 01:18:48 -06:00
Karl Kroening
5f4bfd1fb3 Robustly handle string escaping 2017-07-12 00:33:43 -06:00
Karl Kroening
662c56eb5b : fix python 3 support 2017-07-06 02:50:22 -06:00
Karl Kroening
6887ad8bac Massive refactor to break nodes into streams+nodes 2017-07-06 02:23:13 -06:00