blackteay/ffmpeg-python
1
0
Fork 0
mirror of https://github.com/kkroening/ffmpeg-python.git synced 2025-11-28 08:02:10 +08:00
Code Issues Projects Releases Wiki Activity
459 Commits 13 Branches 14 Tags
Commit Graph

79 Commits

Author SHA1 Message Date
xiota
ddb6e70aa7 Fix test_pipe() 
When trimming, FFmpeg 5.x retains the input presentation timestamp (PTS)
in the output.  This causes the trimmed output frames to be duplicates
of the first.  To prevent this, the output PTS needs to be recalculated.
 2023-01-21 21:10:22 -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
fd1da13f11
Re-apply Black formatting, and wrap docstrings at ~88 columns. (#639) 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
Jacotsu
17995f5ff3 Updated test to check the new cwd parameter 2020-10-09 16:53:17 +02: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
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
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
1c9695d2a0 Run Black code formatter 2019-07-05 19:16:43 -05:00
Michal Trybus
faca0ee87b Test against wrong order of outputs from multiple-output filters 2019-07-02 10:01:47 +02:00
Karl Kroening
8ea0f4ca4b Use Black formatter 2019-06-03 04:03:37 -05:00
Karl Kroening
881ae4efff Add .audio + .video operators 2019-06-03 01:11:48 -05:00
Andrey Kolpakov
3ddc5f04bf Ability to accept extra arguments for ffmpeg.probe command (Issue #187) 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
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 #102, #23 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
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 #80: 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 #30: re-futurize 2018-05-09 03:15:12 -05:00
Karl Kroening
3e68bc8c9a #30: add global_args operator 2018-05-09 03:09:21 -05:00
Karl Kroening
7077eaad64
Merge pull request #67 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
Karl Kroening
6169b89321 Minor improvements (formatting, etc) 2018-03-11 20:03:06 -07:00
Karl Kroening
809ab6cd17 Merge remote-tracking branch 'origin/master' into stream_selectors 2018-03-10 19:01:57 -08:00
Davide Depau
4927bbeea9
Fix string type inconsistency error in ffprobe test 2018-03-08 23:02:04 +01:00
Davide Depau
87a168a063
Do not use Exception.message, use str(Exception) instead 2018-03-08 22:52:06 +01:00
Karl Kroening
2fff94af6c Fix probe exception handling and add test 2018-01-27 22:51:05 -08:00
Karl Kroening
a029d7aacc
Merge pull request #46 from Depaulicious/asplit_filter 
Add `asplit` filter
 2018-01-27 22:22:19 -08:00
Karl Kroening
25bda398c9 Add ffprobe support 2018-01-27 21:21:05 -08:00
Davide Depau
ef9b102676
Merge branch 'master' into stream_selectors 2018-01-12 21:55:38 +01:00
Davide Depau
c87fd5cf56
Add tests for asplit filter 2018-01-10 10:38:42 +01:00
Davide Depau
497105f929
Reimplement .map logic making Node immutable 2018-01-09 16:04:24 +01:00
Davide Depau
db83137f53
Add tests for stream selection and mapping 2018-01-09 15:47:08 +01:00
Noah Stier
fabd401e96
Add 'crop' filter 2018-01-09 15:47:06 +01:00
Karl Kroening
338a1286f7 Fix issue with start_time=0 2018-01-07 23:26:53 -08:00
Karl Kroening
f818cffc55 Add compile operator 2018-01-07 02:28:13 -08:00
Noah Stier
00fb91a4c5 Add 'crop' filter 2017-10-05 23:50:38 -07:00
Karl Kroening
4640adabe0 Futurize 2017-07-12 02:10:44 -06: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
fbf01f24ab Remove extra sample data 2017-07-12 01:19:28 -06:00