Commit graph

672 commits

Author SHA1 Message Date
Ilja Lukin
73fdec8290 Added initial parameters 2020-02-24 21:42:38 +01:00
Jens Hausdorf
afc0e406ed
Merge pull request #699 from alexander-schranz/enhancement/php-compatibility
Fix PhpUnit tests for newer php version
2020-02-24 18:05:43 +01:00
CaliforniaMountainSnake
6dc260fd3d Added ffmpeg version checking in the ComplexMediaTest::testXStackFilter(). 2020-02-20 14:34:21 +03:00
Alexander Schranz
7474bf936f Add bc layer for older php and phpunit versions 2020-02-19 21:52:13 +01:00
CaliforniaMountainSnake
f20ad8a82e Added the ComplexMedia type and the possibility to use -filter_complex and -map features. Added some built-in complex filters. Added the unit and functional tests of the new features. README.md has been updated. 2020-02-18 13:49:32 +03:00
Alexander Schranz
8837f4b115 Set PhpUnit version for older php 2020-02-14 09:08:50 +01:00
Alexander Schranz
824b77dbcf Use php 5.4 supported phpunit bridge 2020-02-13 00:49:08 +01:00
Alexander Schranz
14dc6a8b1b Fix PhpUnit tests for newer php version 2020-02-13 00:39:31 +01:00
Alexander Schranz
537f61095f Fix mocking of objects for newer phpunit version 2020-02-13 00:23:11 +01:00
Jens Hausdorf
89b0c2b4d0
Merge pull request #646 from CamiloManrique/645-copy-audio
Add copy as available codecs for X264 and WebM
2019-04-29 20:02:21 +02:00
Camilo Manrique
0460b9bb60 Add copy as available codecs for X264 and WebM 2019-04-27 13:22:12 -05:00
Jens Hausdorf
f9cc3d0c42
Merge pull request #385 from WyriHaximus/patch-1
Target evenement 3.0 a long side 2.0 and 1.0
2019-02-26 18:04:09 +01:00
Jens Hausdorf
d48cda2861
Merge branch 'master' into patch-1 2019-02-26 06:44:47 +01:00
Jens Hausdorf
d1a281f30f
Merge pull request #593 from jonhassall/master
Added custom filters for Audio, in the same way as custom filters are available for Video
2018-11-24 08:53:13 +01:00
Jens Hausdorf
fab3638caf
Merge branch 'master' into master 2018-11-24 08:32:18 +01:00
Jens Hausdorf
0cfe3352fb
Merge pull request #611 from iljalukin/master
added custom frame filter
2018-11-24 08:31:54 +01:00
Jens Hausdorf
bf19f705a8
Fix formatting 2018-11-23 21:36:39 +01:00
Ilja Lukin
fa2f89a0cf
fixed formatting 2018-11-23 21:27:28 +01:00
Ilja Lukin
7b98238fa2 added unit test for custom frame filter 2018-11-23 20:14:26 +01:00
Ilja Lukin
b3bfb34475 added custom frame filter 2018-11-20 23:32:47 +01:00
Jens Hausdorf
6dacd82c9b
Merge pull request #604 from imerr/patch-1
Strict comparison for -vf check
2018-10-31 19:21:38 +01:00
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