ffmpeg-mappable-media

dan/ffmpeg-mappable-media

Fork 0

Commit graph

fab3638caf

Merge branch 'master' into master Jens Hausdorf 2018-11-24 08:32:18 +01:00
0cfe3352fb

Merge pull request #611 from iljalukin/master Jens Hausdorf 2018-11-24 08:31:54 +01:00
bf19f705a8

Fix formatting Jens Hausdorf 2018-11-23 21:36:39 +01:00
fa2f89a0cf

fixed formatting Ilja Lukin 2018-11-23 21:27:28 +01:00
7b98238fa2 added unit test for custom frame filter Ilja Lukin 2018-11-23 20:14:26 +01:00
b3bfb34475 added custom frame filter Ilja Lukin 2018-11-20 23:32:47 +01:00
6dacd82c9b

Merge pull request #604 from imerr/patch-1 Jens Hausdorf 2018-10-31 19:21:38 +01:00
554158bc06

Strict comparison for -vf check Robin Rolf 2018-10-31 17:37:31 +01:00
98514e7f59

Merge branch 'master' into master Jens Hausdorf 2018-10-30 10:23:34 +01:00
6595f20df7

Merge pull request #603 from andreybolonin/patch-2 Jens Hausdorf 2018-10-30 10:23:20 +01:00
dc74761dfd

add php 7.3 to travis Andrey Bolonin 2018-10-30 00:17:48 +02:00
fa37258502 Added custom filters for Audio, in the same way as custom filters are available for Video Jon Hassall 2018-10-20 14:36:10 +01:00
a8003f0fda

Merge pull request #581 from georgejipa/master Jens Hausdorf 2018-10-04 16:16:54 +02:00
ab50f00774

Merge branch 'master' into master Jens Hausdorf 2018-10-04 15:52:18 +02:00
178247c1db

Merge pull request #588 from PHP-FFMpeg/jens1o-patch-1 Jens Hausdorf 2018-10-04 15:51:44 +02:00
ed22de7eb1

fix #547 Jens Hausdorf 2018-10-04 15:42:02 +02:00
b76c37010a

Merge branch 'master' into master Jens Hausdorf 2018-10-03 21:57:24 +02:00
1f81e5f0f8

Merge pull request #587 from rolandstarke/master Jens Hausdorf 2018-10-03 21:57:08 +02:00
0ee2a63e18 concat allow special chars in filename Roland Starke 2018-10-03 20:32:20 +02:00
7cdf5aa9d6

Merge branch 'master' into master Jens Hausdorf 2018-10-02 16:49:21 +02:00
a8d527a8c4

Merge pull request #582 from tifabien/add-latest-binary-driver-compat Jens Hausdorf 2018-10-02 16:48:51 +02:00
e08ffbd05e Add compatibility to the latest BinaryDriver version Fabien Lucas 2018-10-02 16:01:32 +02:00
706afe23d7 readme improvements part 3 george 2018-10-02 14:46:41 +03:00
5551d0122a readme improvements part 2 george 2018-10-01 21:52:57 +03:00
bad8f77ba0 readme improvements george 2018-10-01 21:42:48 +03:00
fc8dbd6f02

Merge pull request #503 from lasselehtinen/master Jens Hausdorf 2018-09-20 12:54:23 +02:00
279227ab2a

Merge branch 'master' into master Jens Hausdorf 2018-09-05 09:27:36 +02:00
c11b79ab5b Adds Symfony 4 support (#559) Diego Aguiar 2018-08-06 15:02:43 -05:00
0b871e59e7 Clip using input seek (#543) Miroslav Nový 2018-07-06 18:51:09 +02:00
eaebd51117 Fixed typehint for streamCopy Lasse Lehtinen 2018-05-30 15:04:35 +03:00
4f40ba9d96 Merge remote-tracking branch 'upstream/master' Lasse Lehtinen 2018-05-30 15:02:09 +03:00
233742db0a

Merge pull request #530 from PHP-FFMpeg/jens1o-patch-1 Jens Hausdorf 2018-05-28 09:25:34 +02:00
da15debf75

Merge branch 'master' into jens1o-patch-1 Jens Hausdorf 2018-05-28 09:14:13 +02:00
6983fbb411

Merge pull request #534 from qcjackman/qcjackman-patch-frame-save Jens Hausdorf 2018-05-28 09:13:11 +02:00
1711c66aad fix the test expectations qcjackman 2018-05-28 14:00:32 +08:00
8b03686aef fixed a bug when call Frame->save() when set is true qcjackman 2018-05-17 11:12:58 +08:00
da7a0b3777

Merge branch 'master' into jens1o-patch-1 Jens Hausdorf 2018-05-10 14:33:09 +02:00
3d0753cc54

Merge pull request #495 from Shaked/master Jens Hausdorf 2018-05-10 14:31:18 +02:00
fc55cf51d8

fix documentation and add a todo comment Jens Hausdorf 2018-05-10 14:29:24 +02:00
687a266ce0 Adjusted tests Lasse Lehtinen 2018-03-26 19:03:38 +03:00
7e8dd72052 Adjusted tests based on code review Lasse Lehtinen 2018-03-26 18:25:50 +03:00
633bb60dc6 Added tests for audio concatenation Lasse Lehtinen 2018-03-23 17:37:29 +02:00
14323d12c2 Added required concat method for Audio files Lasse Lehtinen 2018-03-22 17:08:59 +02:00
afc236985e fix identation Shaked Klein Orbach 2018-03-08 10:53:38 -06:00
fcd494f723 improve tests, validate frame file type Shaked Klein Orbach 2018-03-07 14:27:27 -06:00
9fe417745e add phpdoc & test png files Shaked Klein Orbach 2018-03-06 17:16:37 -06:00
ae92dd5887 allow to set frame file type instead of hardcoded jpg Shaked Klein Orbach 2018-03-05 18:59:57 -06:00
a1d5fa51ba

Merge pull request #151 from CDNRocket/patch-1 Jens Hausdorf 2018-03-02 14:11:43 +01:00
b60a6c9922

Merge branch 'master' into patch-1 CDNRocket 2018-03-01 21:13:47 +01:00
e91b2276e3

Merge pull request #485 from igorkosteski/master Jens Hausdorf 2018-02-21 20:24:02 +01:00
934ed2739a Media Default Format passing duration parameter to the ProgressListener Igor Kosteski 2018-02-21 16:38:46 +01:00
c03e114969

Merge pull request #484 from igorkosteski/master Jens Hausdorf 2018-02-20 18:44:55 +01:00
368c65a7d5 Comment fix, Video size calculation base on the new video duration and added case on the VideoProgressListenerTest test class. Igor Kosteski 2018-02-19 10:59:58 +01:00
53a978e021 Fix Clipping video transcoding progress not correct Igor Kosteski 2018-02-18 13:57:06 +01:00
2649d45b7b

Merge pull request #456 from carusogabriel/patch-1 Jens Hausdorf 2017-12-14 08:08:25 +01:00
ab04851013

Test against PHP 7.2 Gabriel Caruso 2017-12-12 23:46:10 -02:00
bd449efe87

Merge pull request #454 from alexkart/patch-1 Jens Hausdorf 2017-12-05 17:05:08 +01:00
5737dbffd9

#452 Update README.md Alexander Kartavenko 2017-12-05 13:23:15 +02:00
a99804b6b9

Merge pull request #445 from gabriel-caruso/phpunit Jens Hausdorf 2017-11-09 17:43:24 +01:00
ee4edc8b02 Use PHPUnit\Framework\TestCase instead of PHPUnit_Framework_TestCase Gabriel Caruso 2017-11-08 18:31:27 -02:00
d17f802958

Merge pull request #437 from iganev/master Jens Hausdorf 2017-11-08 18:05:52 +01:00
d7a3cb72b7

Merge branch 'master' into master Jens Hausdorf 2017-11-08 17:56:27 +01:00
d5fc9ed9db array representation backward compat for php5 Ivan Ganev 2017-11-08 18:32:56 +02:00
7c556f851f

Merge pull request #443 from PHP-FFMpeg/jens1o-add-travis-build Jens Hausdorf 2017-11-08 15:02:31 +01:00
1bf60e71cf

Merge branch 'master' of https://github.com/PHP-FFMpeg/PHP-FFMpeg jens1o 2017-11-08 14:50:18 +01:00
d49d42cdbf

add travis build for v1.x branch jens1o 2017-11-08 14:49:23 +01:00
fc5bfc691e cat walked on keyboard, apparently Ivan Ganev 2017-11-07 19:43:43 +02:00
d13fa59759 updated color setter validation to throw InvalidArgumentException instead of silently unsetting values Ivan Ganev 2017-11-07 11:07:33 +02:00
607df6aa79 Merge branch 'master' of https://github.com/iganev/PHP-FFMpeg Ivan Ganev 2017-11-07 11:01:48 +02:00
5d4dd8de37 forgot to update the README and describe the third waveform() param Ivan Ganev 2017-11-07 11:01:42 +02:00
a989b49df1

Merge branch 'master' into master Ivan Ganev 2017-11-07 10:58:17 +02:00
631f5ac5d6

Merge pull request #441 from PHP-FFMpeg/jens1o-add-final-command Jens Hausdorf 2017-11-05 19:06:01 +01:00
4415caa987

Merge branch 'master' into jens1o-add-final-command Jens Hausdorf 2017-11-05 18:57:44 +01:00
5d092ebd95

Merge branch 'jens1o-add-final-command' of https://github.com/PHP-FFMpeg/PHP-FFMpeg into jens1o-add-final-command jens1o 2017-11-05 18:46:40 +01:00
c393e31803

old php versions <.< jens1o 2017-11-05 18:45:35 +01:00
f286ef8cb5

Merge pull request #438 from PHP-FFMpeg/jens1o-patch-1 Jens Hausdorf 2017-11-05 18:44:03 +01:00
703e092766

Merge branch 'master' into jens1o-patch-1 Jens Hausdorf 2017-11-05 18:30:42 +01:00
aabb1fdf8e

Merge branch 'master' into jens1o-add-final-command Jens Hausdorf 2017-11-05 18:30:26 +01:00
c43632faa8

Add Video#getFinalCommand and some refactor jens1o 2017-11-05 18:26:04 +01:00
d559a1d3bb

Merge pull request #439 from PHP-FFMpeg/jens1o-patch-2 Jens Hausdorf 2017-11-05 17:51:31 +01:00
5a889aa5f2

Added buildCommand and getFinalCommand to Audio class jens1o 2017-11-05 17:35:41 +01:00
294b38c75a

drop hhvm support Jens Hausdorf 2017-11-05 17:02:54 +01:00
08b1afac75

add myself to the authors Jens Hausdorf 2017-11-05 16:50:24 +01:00
68c4338652

Merge pull request #432 from PHP-FFMpeg/jens1o-typos Jens Hausdorf 2017-11-05 16:46:28 +01:00
ff1a36fdcc unnecessary use of preg_match_all replaced with preg_match Ivan Ganev 2017-11-05 16:35:50 +02:00
8950598211 addressing author requested fixes/changes Ivan Ganev 2017-11-05 16:28:24 +02:00
456d9c6485 added -y property to ffmpeg when generating waveforms Ivan Ganev 2017-11-03 12:14:00 +02:00
4b1033f8a2 updated README.md to represent the full possible usage of the waveform generation Ivan Ganev 2017-11-02 17:44:48 +02:00
60534a1dbb added waveform color option Ivan Ganev 2017-11-02 17:33:41 +02:00
eb0bc309ef added waveform color option Ivan Ganev 2017-11-02 17:31:39 +02:00
9314f64f54 added waveform color option Ivan Ganev 2017-11-02 17:28:12 +02:00
4bbb50f989 fix readme typos Jens Hausdorf 2017-10-24 21:37:45 +02:00
c64c9e764b Merge pull request #428 from PHP-FFMpeg/jens1o-travis-build Jens Hausdorf 2017-10-16 18:04:44 +02:00
99f0740167 speed up travis build Jens Hausdorf 2017-10-16 17:52:45 +02:00
c0a98db600 Merge pull request #426 from PHP-FFMpeg/jens1o-patch-1 Jens Hausdorf 2017-10-16 17:48:48 +02:00
e482bfb84f add Crop documentation Jens Hausdorf 2017-10-16 17:36:56 +02:00
eca19a81d7 Merge pull request #425 from PHP-FFMpeg/jens1o-isValid Jens Hausdorf 2017-10-16 17:21:28 +02:00
3f5be50e68 Merge branch 'master' into jens1o-isValid Jens Hausdorf 2017-10-16 17:03:34 +02:00
8ffbd63a88 Merge pull request #421 from PHP-FFMpeg/jens1o-remove-api-reference Jens Hausdorf 2017-10-16 17:02:48 +02:00
8c16de99ad add FFProbe#isValid to readme Jens Hausdorf 2017-10-16 16:53:42 +02:00