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
458 Commits 13 Branches 14 Tags
master
Commit Graph

163 Commits

Author SHA1 Message Date
Christian Clauss
df129c7ba3
Let's implicitly fix a typo () 2022-07-11 14:03:07 -07:00
lcjh
fc41f4aa84
Fix heigth -> height typo () 
Co-authored-by: Karl Kroening <karlk@kralnet.us>
 2022-03-07 01:55:30 -08:00
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
Davide Depau
807aaccb14
Revert "Revert "Implemented cwd parameter"" 2021-02-16 23:26:53 +01:00
Davide Depau
c764166f44
Revert "Implemented cwd parameter" 2021-02-16 22:54:27 +01:00
Davide Depau
4974364d17
Merge pull request from Jacotsu/master 
Implemented cwd parameter
 2021-02-15 18:45:52 +01:00
Davide Depau
80e99cbb38
Merge pull request from 372046933/patch-1 
Fix typo in _run.py docstring
 2020-12-13 05:24:28 +01:00
372046933
861b453b43 Fix typo in _run.py docstring 2020-12-11 16:30:12 +08:00
Tercio Gaudencio Filho
0ec6e69d88
Redirect stderr to stdout and stdout to DEVNULL when quiet is requested. 2020-10-30 17:29:44 -03:00
Jacotsu
17995f5ff3 Updated test to check the new cwd parameter 2020-10-09 16:53:17 +02:00
Jacotsu
b64f40a8b5 Fixed typo in cwd parameter usage 2020-10-07 18:56:05 +02:00
Jacotsu
96fb3ff050 Added parameter to set ffmpeg's working directory 2020-10-07 18:52:15 +02:00
Tercio Gaudencio Filho
c12e8890ad
Fix issue . Redirect stdout/stderr to DEVNULL when quiet is requested. 2020-09-15 22:08:51 -03:00
Karl Kroening
4cb7d26f55
Merge pull request from magnusvmt/master 
Add optional timeout argument to probe
 2019-12-30 02:23:02 -06:00
magnusvmt
2d3a078f24 Add test for probe timeout and fix for Python2 
Fix for Python2 so that timeout is only used as keyword argument if it
is provided

Added a test for the new timeout argument that will run for Python >
3.3.
 2019-11-02 16:17:17 +01:00
Karl Kroening
d1f1b64aa9
Merge pull request from hp310780/issue239_typographicalerror 
Fix for Issue 239 - Fixed typographical error
 2019-11-02 01:46:50 -05:00
Harshna Patel
a8e0954f41 Fixed typographical error 2019-10-31 20:07:38 +00: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
magnusvmt
82a00e4849 Add optional timeout argument to probe 
Popen.communicate() supports a timeout argument which is useful in case
there is a risk that the probe hangs.
 2019-10-28 16:28:51 +01:00
Karl Kroening
1c9695d2a0 Run Black code formatter 2019-07-05 19:16:43 -05:00
Michal Trybus
732bf21397 Label-based order of outputs from multiple-output filters 2019-07-02 10:01:48 +02:00
Michal Trybus
faca0ee87b Test against wrong order of outputs from multiple-output filters 2019-07-02 10:01:47 +02:00
Karl Kroening
46eeb41705 Use Black formatter 2019-06-03 04:05:24 -05:00
Karl Kroening
8ea0f4ca4b Use Black formatter 2019-06-03 04:03:37 -05:00
Karl Kroening
5c4a5c720f Include Stream class in API docs 2019-06-03 01:32:44 -05:00
Karl Kroening
881ae4efff Add .audio + .video operators 2019-06-03 01:11:48 -05:00
Jim DeLaHunt
35695d93d4
Fix typo "fmpeg-python" to read "ffmpeg-python" 2019-05-18 00:13:04 -07:00
Andrey Kolpakov
3ddc5f04bf Ability to accept extra arguments for ffmpeg.probe command (Issue ) 2019-04-11 10:52:26 +02:00
Karl Kroening
e5e293fca4 Fix mock import for python3 2018-11-25 21:42:43 -06:00
Karl Kroening
462e34bab3 Add run_async operator 2018-11-25 21:32:04 -06:00
laurentalacoque
5acc6da7ab
Added ffmpeg.probe 'cmd' argument 
ffmpeg.<stream>.run() method has a `cmd` argument for selecting `ffmpeg` executable.
This simple hack adds this feature to the probe command
 2018-09-07 10:53:50 +02:00
Karl Kroening
3cf993e910 Add filter operator 2018-07-13 04:43:56 +02:00
Karl Kroening
217bd2bde6 Fix -map to not use brackets for passthroughs; fixes , 2018-07-13 04:28:21 +02:00
Karl Kroening
0f18c75dab Support concat a/v params 2018-06-30 02:17:00 -07:00
Karl Kroening
4f97d1d679 Add pipe param to view 2018-06-27 23:35:54 -07:00
Karl Kroening
0cc0bfaaaa Merge remote-tracking branch 'origin/master' into feature-80 
Conflicts:
	ffmpeg/_run.py
	ffmpeg/tests/test_ffmpeg.py
 2018-06-16 14:42:41 -05:00
Karl Kroening
c21e8c103f Support video_size output tuple 2018-06-02 00:25:47 -07:00
Karl Kroening
0ed77a30c7 : add video_bitrate and audio_bitrate params 2018-06-01 23:41:24 -07:00
Karl Kroening
6a2d3381b7 Fix tests 2018-05-20 01:43:43 -07:00
Karl Kroening
9a487e8603 Fix exception params 2018-05-20 01:29:59 -07:00
Karl Kroening
940b05f3fc Fix ffprobe exception test 2018-05-20 01:21:30 -07:00
Karl Kroening
ac57e2df13 Add input/output support in run command; update docs 2018-05-20 01:13:07 -07:00
Karl Kroening
84355d419c : re-futurize 2018-05-09 03:15:12 -05:00
Karl Kroening
3e68bc8c9a : add global_args operator 2018-05-09 03:09:21 -05:00
Karl Kroening
7077eaad64
Merge pull request from kkroening/probe 
Add ffprobe support
 2018-05-09 01:28:51 -05:00
Karl Kroening
c162eab2a9 Update docs 2018-05-09 01:26:28 -05:00
Karl Kroening
1e63419a93 Test bad stream selectors 2018-03-11 21:33:32 -07:00
Karl Kroening
57abf6e86e Change selector syntax from [:a] to [a]; remove map operator (for now) 2018-03-11 21:27:26 -07:00