Lasse Lehtinen
|
eaebd51117
|
Fixed typehint for streamCopy
|
2018-05-30 15:04:35 +03:00 |
|
Lasse Lehtinen
|
4f40ba9d96
|
Merge remote-tracking branch 'upstream/master'
|
2018-05-30 15:02:09 +03:00 |
|
Jens Hausdorf
|
233742db0a
|
Merge pull request #530 from PHP-FFMpeg/jens1o-patch-1
fix documentation and add a todo comment
|
2018-05-28 09:25:34 +02:00 |
|
Jens Hausdorf
|
da15debf75
|
Merge branch 'master' into jens1o-patch-1
|
2018-05-28 09:14:13 +02:00 |
|
Jens Hausdorf
|
6983fbb411
|
Merge pull request #534 from qcjackman/qcjackman-patch-frame-save
fix a bug when calling Frame->save()
|
2018-05-28 09:13:11 +02:00 |
|
qcjackman
|
1711c66aad
|
fix the test expectations
|
2018-05-28 14:00:32 +08:00 |
|
qcjackman
|
8b03686aef
|
fixed a bug when call Frame->save() when set is true
|
2018-05-17 11:12:58 +08:00 |
|
Jens Hausdorf
|
da7a0b3777
|
Merge branch 'master' into jens1o-patch-1
|
2018-05-10 14:33:09 +02:00 |
|
Jens Hausdorf
|
3d0753cc54
|
Merge pull request #495 from Shaked/master
allow to set frame file type instead of hardcoded jpg
|
2018-05-10 14:31:18 +02:00 |
|
Jens Hausdorf
|
fc55cf51d8
|
fix documentation and add a todo comment
fixes #529
|
2018-05-10 14:29:24 +02:00 |
|
Lasse Lehtinen
|
687a266ce0
|
Adjusted tests
|
2018-03-26 19:03:38 +03:00 |
|
Lasse Lehtinen
|
7e8dd72052
|
Adjusted tests based on code review
|
2018-03-26 18:25:50 +03:00 |
|
Lasse Lehtinen
|
633bb60dc6
|
Added tests for audio concatenation
|
2018-03-23 17:37:29 +02:00 |
|
Lasse Lehtinen
|
14323d12c2
|
Added required concat method for Audio files
|
2018-03-22 17:08:59 +02:00 |
|
Shaked Klein Orbach
|
afc236985e
|
fix identation
|
2018-03-08 10:53:38 -06:00 |
|
Shaked Klein Orbach
|
fcd494f723
|
improve tests, validate frame file type
|
2018-03-07 14:27:27 -06:00 |
|
Shaked Klein Orbach
|
9fe417745e
|
add phpdoc & test png files
|
2018-03-06 17:16:37 -06:00 |
|
Shaked Klein Orbach
|
ae92dd5887
|
allow to set frame file type instead of hardcoded jpg
|
2018-03-05 18:59:57 -06:00 |
|
Jens Hausdorf
|
a1d5fa51ba
|
Merge pull request #151 from CDNRocket/patch-1
Update AspectRatio.php
|
2018-03-02 14:11:43 +01:00 |
|
CDNRocket
|
b60a6c9922
|
Merge branch 'master' into patch-1
|
2018-03-01 21:13:47 +01:00 |
|
Jens Hausdorf
|
e91b2276e3
|
Merge pull request #485 from igorkosteski/master
Fix Clipping video transcoding progress not correct #2
|
2018-02-21 20:24:02 +01:00 |
|
Igor Kosteski
|
934ed2739a
|
Media Default Format passing duration parameter to the ProgressListener
|
2018-02-21 16:38:46 +01:00 |
|
Jens Hausdorf
|
c03e114969
|
Merge pull request #484 from igorkosteski/master
Fix Clipping video transcoding progress not correct
|
2018-02-20 18:44:55 +01:00 |
|
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 |
|