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

419 Commits

This Branch
This Branch
All Branches
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
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
Karl Kroening
a1e1f30a99
Update README.md 2019-06-03 03:52:07 -05:00
Karl Kroening
2db3c4a3ce
Update README.md 2019-06-03 03:30:04 -05:00
Karl Kroening
bde72f4124
Update README.md 2019-06-03 03:09:27 -05:00
Karl Kroening
411b0a14ff
Update README.md 2019-06-03 02:43:04 -05:00
Karl Kroening
49c877eec6
Update README.md 2019-06-03 02:42:29 -05:00
Karl Kroening
995cf67d7d Update docs 2019-06-03 01:54:35 -05:00
Karl Kroening
a3bac57d0a
Merge pull request #212 from kkroening/av-ops 
Add `.audio` + `.video` operators
 2019-06-03 01:52:58 -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
Karl Kroening
41daf9a953
Merge pull request #209 from JDLH/typo_filters_doc 
Fix typo "fmpeg-python" to read "ffmpeg-python"
 2019-05-19 04:26:12 -05:00
Jim DeLaHunt
35695d93d4
Fix typo "fmpeg-python" to read "ffmpeg-python" 2019-05-18 00:13:04 -07:00
Karl Kroening
ac111dc3a9
Merge pull request #189 from apatsekin/patch-1 
Update README.md
 2019-04-18 02:06:13 -05:00
Karl Kroening
1f3ce1e2aa
Merge pull request #188 from akolpakov/ffprobe_extra_args 
Ability to accept extra arguments for ffmpeg.probe command (Issue #187)
 2019-04-18 02:05:08 -05:00
Karl Kroening
e61653144b
Merge pull request #194 from kkroening/fix-ci 
Fix CI issue with ffmpeg download link
 2019-04-18 01:58:49 -05:00
Karl Kroening
f641413ed8 Fix CI issue with ffmpeg download link 2019-04-18 01:56:29 -05:00
apatsekin
754d2b7227
Update README.md 
non-existing parameter
 2019-04-15 13:52:29 -04: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
eef4da1b27 Slight reordering in readme 2018-11-25 21:59:33 -06:00
Karl Kroening
efae325834 Add another example link in the main readme 2018-11-25 21:57:32 -06:00
Karl Kroening
8de06a2d7a Release 0.1.17 0.1.17 2018-11-25 21:51:48 -06:00
Karl Kroening
c53907acaf Update docs 2018-11-25 21:51:19 -06:00
Karl Kroening
629202806e
Merge pull request #144 from kkroening/run-async 
Add `run_async` operator
 2018-11-25 21:50:50 -06:00
Karl Kroening
7ed9adf483 Fix example readme typo 2018-11-25 21:50:01 -06:00
Karl Kroening
413b71a4e8 Fix RTSP/TCP socket example to use consistent indentation 2018-11-25 21:43:41 -06: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
4276899cea Merge remote-tracking branch 'nitaym/return-immediately' 2018-11-25 21:26:34 -06:00
Karl Kroening
8d7ec92780
Merge pull request #143 from kkroening/tensorflow-stream-example 
Add tensorflow-stream example
 2018-11-25 04:39:04 -06:00
Karl Kroening
c533687d81
Update README.md 2018-11-25 04:38:55 -06:00
Karl Kroening
b1d167ccb8 Add facetime example 2018-11-25 04:36:55 -06:00
Karl Kroening
848f87da4e Add numpy_stream example 2018-11-25 03:54:56 -06:00
Karl Kroening
e0eb332e18
Merge pull request #126 from RPing/master 
small fix for document
 2018-09-17 05:40:22 -05:00
Stephen Chen
6b5a1f2612 small fix for document 2018-09-16 01:16:11 +08:00
Karl Kroening
d47890aebd
Merge pull request #123 from laurentalacoque/master 
Added ffmpeg.probe 'cmd' argument
 2018-09-10 19:18:30 -05: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
Nitay Megides
ce33461259 Added an option to return immediately from run() so you could process the output of ffmpeg while it's processing 2018-07-27 04:31:32 +03:00
Karl Kroening
b6f150c4c3 Release 0.1.16 0.1.16 2018-07-16 01:30:18 +02:00