Commit graph

656 commits

Author SHA1 Message Date
Igor Kosteski
368c65a7d5 Comment fix, Video size calculation base on the new video duration and added case on the VideoProgressListenerTest test class. 2018-02-19 10:59:58 +01:00
Igor Kosteski
53a978e021 Fix Clipping video transcoding progress not correct 2018-02-18 13:57:06 +01:00
Jens Hausdorf
2649d45b7b
Merge pull request #456 from carusogabriel/patch-1
Test against PHP 7.2
2017-12-14 08:08:25 +01:00
Gabriel Caruso
ab04851013
Test against PHP 7.2 2017-12-12 23:46:10 -02:00
Jens Hausdorf
bd449efe87
Merge pull request #454 from alexkart/patch-1
#452 Update README.md
2017-12-05 17:05:08 +01:00
Alexander Kartavenko
5737dbffd9
#452 Update README.md
Add missing require statement.
2017-12-05 13:23:15 +02:00
Jens Hausdorf
a99804b6b9
Merge pull request #445 from gabriel-caruso/phpunit
Use PHPUnit\Framework\TestCase instead of PHPUnit_Framework_TestCase
2017-11-09 17:43:24 +01:00
Gabriel Caruso
ee4edc8b02 Use PHPUnit\Framework\TestCase instead of PHPUnit_Framework_TestCase 2017-11-08 18:38:32 -02:00
Jens Hausdorf
d17f802958
Merge pull request #437 from iganev/master
Added color option to waveform generation
2017-11-08 18:05:52 +01:00
Jens Hausdorf
d7a3cb72b7
Merge branch 'master' into master 2017-11-08 17:56:27 +01:00
Ivan Ganev
d5fc9ed9db array representation backward compat for php5 2017-11-08 18:32:56 +02:00
Jens Hausdorf
7c556f851f
Merge pull request #443 from PHP-FFMpeg/jens1o-add-travis-build
add travis build for upcoming branch
2017-11-08 15:02:31 +01:00
jens1o
1bf60e71cf
Merge branch 'master' of https://github.com/PHP-FFMpeg/PHP-FFMpeg 2017-11-08 14:50:18 +01:00
jens1o
d49d42cdbf
add travis build for v1.x branch 2017-11-08 14:49:23 +01:00
Ivan Ganev
fc5bfc691e cat walked on keyboard, apparently 2017-11-07 19:43:43 +02:00
Ivan Ganev
d13fa59759 updated color setter validation to throw InvalidArgumentException instead of silently unsetting values 2017-11-07 11:07:33 +02:00
Ivan Ganev
607df6aa79 Merge branch 'master' of https://github.com/iganev/PHP-FFMpeg 2017-11-07 11:01:48 +02:00
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