blackteay/ffmpeg-python
1
0
Fork 0
mirror of https://github.com/kkroening/ffmpeg-python.git synced 2025-04-05 12:48:09 +08:00
Code Issues Projects Releases Wiki Activity
419 Commits 13 Branches 14 Tags
Commit Graph

144 Commits

Author SHA1 Message Date
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
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 #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
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 #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
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 #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
6ebda44a63
Merge pull request #58 from 153957/patch-1 
Cleanup graph source file after rendering graph to pdf
 2018-01-27 22:21:27 -08:00
Karl Kroening
24e737f78e Fix ffprobe string decoding 2018-01-27 21:32:11 -08:00
Karl Kroening
25bda398c9 Add ffprobe support 2018-01-27 21:21:05 -08:00
Davide Depau
f1e418be4c
Add filter_multi_output to __all__ so it's available in API 2018-01-26 14:38:57 +01:00
Arne de Laat
50c4a8985d
Cleanup graph source file after rendering graph to pdf 2018-01-16 22:10:41 +01: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
e7fbb288d4
Fix name of asplit filter 2018-01-10 10:35:23 +01:00
Davide Depau
ea90d91dfe
Expand unclear one-line implicit conditional statement 2018-01-09 16:04:33 +01: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
Davide Depau
497105f929
Reimplement .map logic making Node immutable 2018-01-09 16:04:24 +01:00
Davide Depau
861980db0b
Simplify, expand and explain complicated loops in dag.py 2018-01-09 15:47:09 +01:00
Davide Depau
783bdbdb37
Remove unused imports 2018-01-09 15:47:09 +01:00