Commit graph

689 commits

Author SHA1 Message Date
Ivan Ganev
5d4dd8de37 forgot to update the README and describe the third waveform() param 2017-11-07 11:01:42 +02:00
Ivan Ganev
a989b49df1
Merge branch 'master' into master 2017-11-07 10:58:17 +02:00
Jens Hausdorf
631f5ac5d6
Merge pull request #441 from PHP-FFMpeg/jens1o-add-final-command
add `getFinalCommand`
closes #403
2017-11-05 19:06:01 +01:00
Jens Hausdorf
4415caa987
Merge branch 'master' into jens1o-add-final-command 2017-11-05 18:57:44 +01:00
jens1o
5d092ebd95
Merge branch 'jens1o-add-final-command' of https://github.com/PHP-FFMpeg/PHP-FFMpeg into jens1o-add-final-command 2017-11-05 18:46:40 +01:00
jens1o
c393e31803
old php versions <.< 2017-11-05 18:45:35 +01:00
Jens Hausdorf
f286ef8cb5
Merge pull request #438 from PHP-FFMpeg/jens1o-patch-1
add myself to the authors
2017-11-05 18:44:03 +01:00
Jens Hausdorf
703e092766
Merge branch 'master' into jens1o-patch-1 2017-11-05 18:30:42 +01:00
Jens Hausdorf
aabb1fdf8e
Merge branch 'master' into jens1o-add-final-command 2017-11-05 18:30:26 +01:00
jens1o
c43632faa8
Add Video#getFinalCommand and some refactor 2017-11-05 18:26:04 +01:00
Jens Hausdorf
d559a1d3bb
Merge pull request #439 from PHP-FFMpeg/jens1o-patch-2
drop hhvm support
2017-11-05 17:51:31 +01:00
jens1o
5a889aa5f2
Added buildCommand and getFinalCommand to Audio class
#403
2017-11-05 17:35:41 +01:00
Jens Hausdorf
294b38c75a
drop hhvm support
It's useless and it's dying and taking build time :c
2017-11-05 17:02:54 +01:00
Jens Hausdorf
08b1afac75
add myself to the authors 2017-11-05 16:50:24 +01:00
Jens Hausdorf
68c4338652
Merge pull request #432 from PHP-FFMpeg/jens1o-typos
fix readme typos
2017-11-05 16:46:28 +01:00
Ivan Ganev
ff1a36fdcc unnecessary use of preg_match_all replaced with preg_match 2017-11-05 16:35:50 +02:00
Ivan Ganev
8950598211 addressing author requested fixes/changes 2017-11-05 16:28:24 +02:00
Ivan Ganev
456d9c6485 added -y property to ffmpeg when generating waveforms 2017-11-03 12:14:00 +02:00
Ivan Ganev
4b1033f8a2 updated README.md to represent the full possible usage of the waveform generation 2017-11-02 17:44:48 +02:00
Ivan Ganev
60534a1dbb added waveform color option 2017-11-02 17:33:41 +02:00
Ivan Ganev
eb0bc309ef added waveform color option 2017-11-02 17:31:39 +02:00
Ivan Ganev
9314f64f54 added waveform color option 2017-11-02 17:28:12 +02:00
Jens Hausdorf
4bbb50f989 fix readme typos 2017-10-24 21:37:45 +02:00
Jens Hausdorf
c64c9e764b Merge pull request #428 from PHP-FFMpeg/jens1o-travis-build
speed up travis build
2017-10-16 18:04:44 +02:00
Jens Hausdorf
99f0740167 speed up travis build 2017-10-16 17:52:45 +02:00
Jens Hausdorf
c0a98db600 Merge pull request #426 from PHP-FFMpeg/jens1o-patch-1
add Crop documentation
2017-10-16 17:48:48 +02:00
Jens Hausdorf
e482bfb84f add Crop documentation 2017-10-16 17:36:56 +02:00
Jens Hausdorf
eca19a81d7 Merge pull request #425 from PHP-FFMpeg/jens1o-isValid
add FFProbe#isValid to readme
2017-10-16 17:21:28 +02:00
Jens Hausdorf
3f5be50e68 Merge branch 'master' into jens1o-isValid 2017-10-16 17:03:34 +02:00
Jens Hausdorf
8ffbd63a88 Merge pull request #421 from PHP-FFMpeg/jens1o-remove-api-reference
remove api link
2017-10-16 17:02:48 +02:00
Jens Hausdorf
8c16de99ad add FFProbe#isValid to readme 2017-10-16 16:53:42 +02:00
Jens Hausdorf
852b26539f remove api link
fixes #420
2017-10-12 21:24:57 +02:00
Jens Hausdorf
d386cc0cea Merge pull request #419 from esokullu/master
Fixed: the use of [] was killing PHP 5.3 compat
2017-10-12 21:22:41 +02:00
Emre Sokullu
2bd63f4feb Fixed: the use of [] was killing PHP 5.3 compat 2017-10-11 16:45:20 -07:00
Jens Hausdorf
36a7d70732 Merge pull request #364 from jens1o/patch-1
add `libvpx-vp9` to WebM video
2017-09-20 06:36:51 +02:00
Jens Hausdorf
85f67937dc Merge branch 'master' into patch-1 2017-09-20 06:23:23 +02:00
Jens Hausdorf
5a1b888b91 Merge pull request #413 from PHP-FFMpeg/jens1o-ffprobe-isvalid
Add FFProbe#isValid
2017-09-19 20:30:37 +02:00
jens1o
ed5f21e0c8
php 5.x has problems with mocking with type hinting... 2017-09-19 20:18:43 +02:00
jens1o
40f41a6130
Merge branch 'master' of https://github.com/PHP-FFMpeg/PHP-FFMpeg 2017-09-19 19:29:07 +02:00
jens1o
74a1d6539c
Add FFProbe#isValid
fixes #394
2017-09-19 19:28:34 +02:00
Jens Hausdorf
d0c47f68bb Merge pull request #411 from PHP-FFMpeg/jens1o-patch-1
fix typo; closes #404
2017-09-19 18:49:57 +02:00
Jens Hausdorf
07d1732300 fix typo; closes #404 2017-09-19 18:26:00 +02:00
Jens Hausdorf
ef0ece8e61 Merge pull request #407 from letungit90/master
support crop with dynamic point
2017-09-19 07:24:47 +02:00
Le_Tung
47b8d84979 add dynamic point Unit Test 2017-09-19 10:44:11 +09:00
Le_Tung
3210b1d4fd support crop with dynamic point 2017-09-08 16:03:14 +09:00
Jens Hausdorf
fa4bd3d12b Merge branch 'master' into patch-1 2017-08-05 23:35:59 +02:00
Cees-Jan Kiewiet
8b2ac18ea4 Target evenement 3.0 a long side 2.0 and 1.0 2017-07-24 00:11:44 +02:00
Romain Biard
96225b2dff Revert "Audio Params" (#377)
* Revert "Correct  type in VideoFilters->framerate (#372)"

This reverts commit cedcd37bd2.

* Revert "fix sources parameter type (array) in concat function (#363)"

This reverts commit af00b9d6a3.

* Revert "Audio Params (#344)"

This reverts commit cb7d850338.
2017-06-30 21:27:10 +02:00
Jens Hausdorf
292ec162e4 Merge branch 'master' into patch-1 2017-06-28 05:59:32 +02:00
Cuong M. Tran
cedcd37bd2 Correct type in VideoFilters->framerate (#372) 2017-06-28 00:46:54 +02:00