dan/ffmpeg-mappable-media
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
664 commits 2 branches 5 tags 12 MiB
Commit graph

664 commits

This branch
This branch
All branches
Author SHA1 Message Date
Pascal Baljet
40d9afd0d6 Merge branch 'master' into pr/815 2021-12-20 12:48:37 +01:00
Pascal Baljet
c69632a2be
 		Merge pull request #845 from PHP-FFMpeg/improve-github-actions 
Update test.yaml
 2021-12-20 12:18:20 +01:00
Pascal Baljet
7eace8852a PHP 5.5+ and replaced doctrine/cache with symfony/cache 2021-12-20 12:15:25 +01:00
Pascal Baljet
50a7114016 Merge branch 'master' into pr/815 2021-12-20 10:32:41 +01:00
Pascal Baljet
bb5cb190bd
 		Merge pull request #843 from vlados/master 
Support for doctrine/cache 2.0
 2021-12-20 10:30:17 +01:00
Pascal Baljet
29ce1dd5d3 Merge branch 'master' into pr/843 2021-12-20 10:27:23 +01:00
Fran Moreno
aa99de9902
 		Try to fix travis 2021-12-15 16:01:01 +01:00
Fran Moreno
2bed29ffbc
 		Remove silex support 
Silex was abandoned 3 years ago, removing its support will allow
to bump some dependencies.
 2021-12-15 16:00:46 +01:00
Jens Hausdorf
df823d86eb
 		Merge pull request #840 from alexander-schranz/feature/github-action 2021-12-15 15:19:31 +01:00
Romain Neutron
ccdabcd44c
 		Merge pull request #844 from PHP-FFMpeg/romainneutron-patch-1 
Delete .travis.yml
 2021-12-13 20:40:14 +01:00
Romain Neutron
0c13c6dbdf
 		Delete .travis.yml 2021-12-13 20:38:30 +01:00
Vladislav Stoitsov
da9b3215c2
 		Support for doctrine/cache 2.0 2021-12-10 17:35:58 +02:00
Alexander Schranz
bc50855aa9 Fix php 5.3 compatibility 2021-11-27 00:28:01 +01:00
Alexander Schranz
e7e56d0440 Fix php 5.3 compatibility 2021-11-27 00:23:32 +01:00
Alexander Schranz
c2b99e1ea6 Fix php 5.3 compatibility 2021-11-27 00:20:01 +01:00
Alexander Schranz
d7df3dae8d Fix php 5.3 compatibility 2021-11-27 00:17:12 +01:00
Alexander Schranz
1859ab7253 Fix php 5.3 compatibility 2021-11-27 00:13:48 +01:00
Alexander Schranz
0fe457348d Update github action 2021-11-27 00:10:34 +01:00
Alexander Schranz
d59cb26d91 Add github actions 2021-11-27 00:06:57 +01:00
Romain Biard
edc0a7729d
 		Updated the README (#805) 
Removed a non-valid link to Windows build and added a link to the FFMPEG download page were all executables can be found.
 2021-03-29 22:20:00 +02:00
Ilya Chekalsky
afffd627ff
 		Add ability to disable -b:v (#767) 
* adds ability to disable -b:v

* Fixed a bug in the way the paths to the test files were defined in the AudioConcatenationTest.php file

* Added a test to make sure that a negative kilobit rate returns an exception

* Added a test to check that the -b:v options are not set if the kilo bitrate is set to 0

* Disable 2pass when -b:v is disabled

Co-Authored-By: Philipp Doblhofer <6283313+philipp-doblhofer@users.noreply.github.com>

* Changed the way we call the class FFMpeg\Exception\InvalidArgumentException in tests

* Changed the way we call the class FFMpeg\Exception\InvalidArgumentException in tests

* Updated the README to include this new option

Co-authored-by: Romain Biard <romain.biard@gmail.com>
Co-authored-by: Philipp Doblhofer <6283313+philipp-doblhofer@users.noreply.github.com>
 2021-03-04 19:17:34 +01:00
41i 6h0rb4n1
08ccabcd77
 		Issue 539 (#759) 
* Issue running ClipFilter with  set to NULL #566
* Can't encode video Fatal error #539

Co-authored-by: Romain Biard <romain.biard@gmail.com>
 2021-03-02 21:54:00 +01:00
h0rn3z0r
7a30ef4a3b
 		fix readme typo (#694) 
Co-authored-by: Jens Hausdorf <mail@jens-hausdorf.de>
Co-authored-by: Romain Biard <romain.biard@gmail.com>
 2021-03-02 17:45:38 +01:00
Nicholas
7ee0787183
 		composer ... --prefer-dist now ignores dev files (#783) 
Suggested by issue: #710
Authored by @nick-cd
 2021-03-02 16:30:50 +01:00
Marcus Bointon
8f7575b076
 		Fix docs generation, PSR-12 type compliance (#790) 
* Correct docs generation, fixes #774

* Standardise on unaliased int and bool types, as per PSR-12 section 2.5
 2021-03-02 15:39:45 +01:00
Markus Fasselt
7abb6d36cb
 		Fix boolean types (#779) 
Changed `Boolean` to `bool` to avoid Psalm being confused with a potential class.
Thanks @digilist
 2020-12-23 11:14:24 +01:00
Boris Momčilović
a1a3281dbf
 		PHP 8 Support (#782) 
Thanks @kornrunner for these changes:
* Test against PHP 8
* U-Tests: FFProbe: OptionsTester: handle phpunit deprecation of at
* FiltersCollection: tweak for call_user_func_array and PHP 8 named arguments
 2020-12-18 15:27:38 +01:00
William Desportes
6a61d67288
 		Use Doctum instead of Sami (#761) 
* Use Doctum instead of Sami

- Fix .gitignore
- Move the process to docs
- Add .gitattributes

* Fix the symfony/process versions after sami was removed

Used the maximum version of 2.x and forced 3.3 before deprecation in 3.4
 2020-10-12 16:04:21 +02:00
Jens Hausdorf
c3d11cdd92
 		Merge pull request #751 from alexander-schranz/patch-1 
Allow newer version of temporary filesystem for php 8 support
 2020-09-04 20:59:58 +02:00
Alexander Schranz
27eeb5286a
 		Allow newer version of temporary filesystem 2020-08-10 18:12:35 +02:00
Jens Hausdorf
c5ef9edb03
 		Merge pull request #747 from alexander-schranz/patch-1 
Add Support for PHP 8
 2020-07-27 09:39:06 +02:00
Alexander Schranz
942015f9a3 Add compatibility to PHP 8 2020-07-24 03:20:49 +02:00
Jens Hausdorf
6e3a69726a
 		Merge pull request #718 from RobertPlant/master 
Fixed typo in the readme referring to FrameRate
 2020-05-02 11:10:19 +02:00
Robert Plant
07460f7468
 		Fixed typo in the readme referring to FrameRate 2020-04-24 16:51:52 +01:00
Jens Hausdorf
4175c02b7d
 		Merge pull request #700 from CaliforniaMountainSnake/master 
ComplexMedia, -filter_complex and -map features
 2020-03-29 11:57:10 +02:00
CaliforniaMountainSnake
5b85b6b84d Merge remote-tracking branch 'upstream/master' 2020-03-23 18:04:18 +03:00
CaliforniaMountainSnake
0d3bed21a7 ComplexMedia has been renamed to the AdvancedMedia. 2020-03-23 17:47:36 +03:00
Jens Hausdorf
984dbd046b
 		Merge pull request #703 from iljalukin/master 
Added initial parameters
 2020-03-23 10:32:09 +01:00
CaliforniaMountainSnake
4469847d46 Minor improvements of the ComplexMedia 2020-03-02 14:50:42 +03:00
CaliforniaMountainSnake
71766fed47 Added the BC Layer alias for some phpunit methods to fix build at php <= 5.5. 2020-02-27 20:59:26 +03:00
CaliforniaMountainSnake
d6f95508a9 Added runtime check of the ffmpeg version before starting the command in the ComplexMedia. Added the FFMpegDriver::getVersion() method. 2020-02-26 12:33:45 +03:00
CaliforniaMountainSnake
580fb21d5a Merge remote-tracking branch 'upstream/master' 2020-02-26 09:43:23 +03:00
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