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

456 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Karl Kroening
ef00863269
Fix Black in GHA for Python 2.7 (#680) 
(At least until Python 2.7 support is finally eliminated)
 2022-07-11 13:51:06 -07:00
Christian Clauss
ed70f2e619
Upgrade GitHub Actions (#643) 2022-07-11 13:39:36 -07:00
lcjh
fc41f4aa84
Fix heigth -> height typo (#596) 
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 (#330) 
* 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
cb9d400467
Add FFmpeg installation instructions (#642) 
Co-authored-by: digitalcircuits <59550818+digitalcircuits@users.noreply.github.com>
Co-authored-by: digitalcircuits <digitalcircuits@github>
 2022-03-07 01:19:09 -08:00
Karl Kroening
29b6f09298
Use GitHub Actions for CI. (#641) 
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 #605, for example.

Notes:
* Python 3.10 is not yet supported due to the `collections.Iterable`
  issue discussed in #330, #624, 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. (#639) 2022-03-06 13:24:40 -08:00
Davide Depau
f3079726fa
Merge pull request #494 from kkroening/revert-493-revert-430-master 
Revert "Revert "Implemented cwd parameter""
 2021-02-16 23:27:34 +01:00
Davide Depau
807aaccb14
Revert "Revert "Implemented cwd parameter"" 2021-02-16 23:26:53 +01:00
Davide Depau
cc1f664fb4
Merge pull request #493 from kkroening/revert-430-master 
Revert "Implemented cwd parameter"
 2021-02-16 22:55:10 +01:00
Davide Depau
c764166f44
Revert "Implemented cwd parameter" 2021-02-16 22:54:27 +01:00
Davide Depau
4974364d17
Merge pull request #430 from Jacotsu/master 
Implemented cwd parameter
 2021-02-15 18:45:52 +01:00
Davide Depau
80e99cbb38
Merge pull request #433 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
Davide Depau
0612a44f91
Merge pull request #417 from 0x3333/master 
Fix issue #195. Redirect stdout/err to /dev/null
 2020-12-06 23:54:08 +01:00
Davide Depau
e044890010
Merge pull request #440 from raulpy271/master 
adding http server example
 2020-12-03 17:01:40 +01:00
raulpy271
5b6b58308f
Replacing server_url content, "http://localhost:8080" to "http://127.0.0.1:8080". 2020-12-02 14:19:53 -03:00
Davide Depau
2931580908
Merge pull request #442 from revolter/patch-1 
Add command line arguments FAQ
 2020-12-02 15:57:14 +01:00
Iulian Onofrei
08e50ac02c
Add command line arguments FAQ 2020-11-08 12:51:35 +02:00
Raul
15ffcc0c72 adding http server example 2020-10-30 18:41:59 -03: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 #195. Redirect stdout/stderr to DEVNULL when quiet is requested. 2020-09-15 22:08:51 -03:00
Karl Kroening
4cb7d26f55
Merge pull request #283 from magnusvmt/master 
Add optional timeout argument to probe
 2019-12-30 02:23:02 -06:00
Karl Kroening
8809a54cff
Merge pull request #245 from cclauss/patch-1 
Travis CI and tox.ini: Add Python 3.7 to the testing
 2019-12-30 02:20:24 -06:00
Karl Kroening
b14785b61b
Merge pull request #247 from kylemcdonald/patch-1 
tensorflow streaming typo
 2019-12-30 02:19:42 -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
3cef431045
Merge pull request #248 from kylemcdonald/master 
Added mono to stereo example
 2019-11-02 02:05:25 -05:00
Karl Kroening
d1f1b64aa9
Merge pull request #287 from hp310780/issue239_typographicalerror 
Fix for Issue 239 - Fixed typographical error
 2019-11-02 01:46:50 -05:00
Karl Kroening
24633404df
Merge pull request #286 from cmehay/duplicate_parameters 
Duplicate parameters can be set in kwargs with an iterator
 2019-11-02 01:46:20 -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
Kyle McDonald
c99e97b687 added mono to stereo example 2019-08-04 15:18:55 -07:00
Kyle McDonald
bbd56a35a3
tensorflow streaming typo 2019-08-04 15:09:40 -07:00
Christian Clauss
ed9b7f8804
tox.ini: Add py37 to the testing 
Python 3.4 is end of life...  Should we drop support for it?
 2019-07-31 06:32:29 +02:00
Christian Clauss
c6c2dfdc28
Travis CI: Add Python 3.7 to the tests 
Python 3.4 is end of life...  Should we drop support for it?
 2019-07-31 06:30:22 +02:00
Karl Kroening
78fb6cf2f1 Release 0.2.0 0.2.0 2019-07-05 19:17:30 -05:00
Karl Kroening
1c9695d2a0 Run Black code formatter 2019-07-05 19:16:43 -05:00
Karl Kroening
c14efc9a19
Merge pull request #230 from komar007/fix_multiple_output_order 
Fix multiple output order
 2019-07-05 19:15:23 -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
63973d0b29
Update README.md 2019-06-28 22:14:44 -05:00
Karl Kroening
ab42ab4dfc
Merge pull request #213 from kkroening/black 
Use Black formatter
 2019-06-10 17:52:48 -05:00
Karl Kroening
fff79e6b93 Merge remote-tracking branch 'origin/master' into black 
Conflicts:
	setup.py
 2019-06-10 17:42:39 -05:00
Karl Kroening
1b2634291d Release 0.1.18 0.1.18 2019-06-03 04:06:26 -05: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