Commit graph

701 commits

Author SHA1 Message Date
Robin Rolf
554158bc06
Strict comparison for -vf check
This fixes an edge case where 0 and "-vf" is equal
2018-10-31 17:37:31 +01:00
Jens Hausdorf
98514e7f59
Merge branch 'master' into master 2018-10-30 10:23:34 +01:00
Jens Hausdorf
6595f20df7
Merge pull request #603 from andreybolonin/patch-2
add php 7.3 to travis
2018-10-30 10:23:20 +01:00
Andrey Bolonin
dc74761dfd
add php 7.3 to travis 2018-10-30 00:17:48 +02:00
Jon Hassall
fa37258502 Added custom filters for Audio, in the same way as custom filters are available for Video 2018-10-20 14:36:10 +01:00
Jens Hausdorf
a8003f0fda
Merge pull request #581 from georgejipa/master
Readme typos
2018-10-04 16:16:54 +02:00
Jens Hausdorf
ab50f00774
Merge branch 'master' into master 2018-10-04 15:52:18 +02:00
Jens Hausdorf
178247c1db
Merge pull request #588 from PHP-FFMpeg/jens1o-patch-1
Document the `setFrameFileType` function
2018-10-04 15:51:44 +02:00
Jens Hausdorf
ed22de7eb1
fix #547 2018-10-04 15:42:02 +02:00
Jens Hausdorf
b76c37010a
Merge branch 'master' into master 2018-10-03 21:57:24 +02:00
Jens Hausdorf
1f81e5f0f8
Merge pull request #587 from rolandstarke/master
concat allow special chars in filename
2018-10-03 21:57:08 +02:00
Roland Starke
0ee2a63e18 concat allow special chars in filename 2018-10-03 20:32:20 +02:00
Jens Hausdorf
7cdf5aa9d6
Merge branch 'master' into master 2018-10-02 16:49:21 +02:00
Jens Hausdorf
a8d527a8c4
Merge pull request #582 from tifabien/add-latest-binary-driver-compat
Add compatibility to the latest BinaryDriver version
2018-10-02 16:48:51 +02:00
Fabien Lucas
e08ffbd05e Add compatibility to the latest BinaryDriver version 2018-10-02 16:01:32 +02:00
george
706afe23d7 readme improvements part 3 2018-10-02 14:46:41 +03:00
george
5551d0122a readme improvements part 2 2018-10-01 21:52:57 +03:00
george
bad8f77ba0 readme improvements 2018-10-01 21:42:48 +03:00
Jens Hausdorf
fc8dbd6f02
Merge pull request #503 from lasselehtinen/master
Added required concat method for Audio files
2018-09-20 12:54:23 +02:00
Jens Hausdorf
279227ab2a
Merge branch 'master' into master 2018-09-05 09:27:36 +02:00
Diego Aguiar
c11b79ab5b Adds Symfony 4 support (#559)
alchemy/binary-driver 2 added support for Symfony4.
2018-08-06 22:02:43 +02:00
Miroslav Nový
0b871e59e7 Clip using input seek (#543)
Making video clip by input seeking
2018-07-06 18:51:09 +02:00
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