Commit graph

410 commits

Author SHA1 Message Date
Maxime Veber
1b842989c4 Fix travis run by updating ffmpeg
Update .travis.yml

There is no ppa for precise (ubuntu 12.04) to use ffmpeg 3. So I updated
travis to run trusty (ubuntu 14.04) but it can't test on php5.3 in that
configuration. That's why I drop the test support for php 5.3.

Drop php 5.3 support
2016-12-05 18:13:52 +01:00
Maxime Veber
8f3b65dec6 Add support for aac codec of ffmpeg3 2016-12-05 18:12:12 +01:00
Sébastien Lavoie
e9f87eee94 Added documentation for the watermark filter (#221)
Added documentation for the watermark filter
2016-05-02 19:24:08 +02:00
Patrik Karisch
06d8031b9d Update github templates 2016-03-23 07:57:25 +01:00
Patrik Karisch
a1e12ecf33 Merge pull request #209 from PHP-FFMpeg/enhancement/changelog
Updated changelog to follow keepachangelog.com style

| Q                  | A
| ------------------ | ---
| Bug fix?           | no
| New feature?       | no
| BC breaks?         | no
| Deprecations?      | no
| Fixed tickets      | -
| Related issues/PRs | -
| License            | MIT

#### What's in this PR?

Updated changelog to follow keepachangelog.com style to have better informations in the changelog.

#### Why?

Since the changelog is a markdown file, we sould take use of formatting and linking to the comparison page. And ISO date is much better, than ambiguous date format ;)
2016-03-11 01:26:35 +01:00
Patrik Karisch
d1c60d29d8 Updated changelog to follow keepachangelog.com style 2016-03-09 22:09:51 +01:00
Patrik Karisch
7770b0e361 Merge pull request #207 from PHP-FFMpeg/enhancement/issue-template
Add a meaningful issue template

| Q                  | A
| ------------------ | ---
| Bug fix?           | no
| New feature?       | no
| BC breaks?         | no
| Deprecations?      | no
| Fixed tickets      | -
| Related issues/PRs | -
| License            | MIT

#### What's in this PR?

A meaningful issue template.

#### Why?

Such templates should encourage first-timers to create good issue descriptions, which helps us reproducing it.
2016-03-09 20:43:04 +01:00
Patrik Karisch
b191285930 Add a meaningful issue template 2016-03-09 00:57:41 +01:00
Patrik Karisch
48d40cd9c6 Merge pull request #206 from PHP-FFMpeg/enhancement/pull-request-template
| Q                  | A
| ------------------ | ---
| Bug fix?           | no
| New feature?       | no
| BC breaks?         | no
| Deprecations?      | no
| Fixed tickets      | -
| Related issues/PRs | -
| License            | MIT

#### What's in this PR?

A meaningful pull request template similar to this pull request description.

#### Why?

Such templates should encourage first-timers to create good pull request descriptions, which helps us reviewing it.
2016-03-09 00:52:28 +01:00
Patrik Karisch
16ee22dc65 Add a meaningful pull request template 2016-03-09 00:51:01 +01:00
Patrik Karisch
7687be530c Update changelog 2016-03-08 01:47:06 +01:00
Patrik Karisch
be7b75daad Merge pull request #205 from PHP-FFMpeg/enhancement/improve-test-suite
Improve test suite
2016-03-07 00:19:23 +01:00
Patrik Karisch
232db3ce40 Build pushes only on master and pull requests only 2016-03-07 00:10:47 +01:00
Patrik Karisch
fa0581b468 Improve travis builds and test PHP 7.0 and HHVM (with allow failures) 2016-03-07 00:10:21 +01:00
Patrik Karisch
f9c6316bad Cleanup phpunit configs and PSR-4 autoloading and namespaces for tests 2016-03-06 23:38:04 +01:00
Patrik Karisch
d4db96662c Cleanup composer, ignore lock, add me as a maintainer to the authors ;) 2016-03-06 23:19:40 +01:00
Ha Phan
bd61d8d35e Remove unused statement 2016-03-05 18:05:30 +01:00
Ha Phan
1fee6fb4be Add missing getter $currentTime 2016-03-05 18:05:24 +01:00
Romain Neutron
f765864749 Fix test URL 2016-03-05 18:03:49 +01:00
Romain Neutron
4a76e96cb9 Merge pull request #204 from patkar/enhancement/evenenment-v2
Allow usage of evenement v2.0
2016-03-05 18:00:13 +01:00
Patrik Karisch
46394564a5 Allow usage of evenement v2.0 2016-03-02 03:18:02 +01:00
Romain Neutron
6e3134e4ec Update changelog 2015-01-30 20:07:38 +01:00
Romain Neutron
f62077ab64 gnéééé 2015-01-30 20:05:30 +01:00
Romain Neutron
559708c0e4 Merge pull request #134 from cangelis/cropfilter
Add Crop Filter
2015-01-30 20:03:31 +01:00
Romain Neutron
0736141e16 Use latest fix 2015-01-30 19:59:13 +01:00
Romain Neutron
92121bb804 Merge branch 'patch-2' of github.com:sujayjaju/PHP-FFMpeg into sujayjaju-patch-2
* 'patch-2' of github.com:sujayjaju/PHP-FFMpeg:
  Update AbstractData.php
2015-01-30 19:54:33 +01:00
Romain Neutron
863fd1b70f Fix file name 2015-01-30 19:52:57 +01:00
Romain Neutron
5c20397b64 Add exception if invalid file 2015-01-30 19:48:00 +01:00
Romain Neutron
6cd008128c Merge branch 'patch-3' of github.com:sujayjaju/PHP-FFMpeg into sujayjaju-patch-3
* 'patch-3' of github.com:sujayjaju/PHP-FFMpeg:
  Use watermark image while watermarking!
2015-01-30 19:45:21 +01:00
Romain Neutron
303a04cff6 Merge pull request #139 from sujayjaju/patch-4
Support for libfdk_aac
2015-01-30 19:44:31 +01:00
sujayjaju
4b8519270d Support for libfdk_aac 2014-12-11 20:55:21 +05:30
sujayjaju
95fa854c3e Use watermark image while watermarking!
The filter does not seem to actually use the watermark (image path). This update fixes the functionality.
2014-12-11 16:40:59 +05:30
Romain Neutron
0599ff4def Merge pull request #131 from sujayjaju/patch-1
Update AbstractStreamableMedia.php
2014-12-04 19:51:40 +01:00
Romain Neutron
cba1ff9c67 Merge pull request #136 from diego-vieira/master
fix audio example on README.md
2014-12-04 19:43:26 +01:00
Diego
fcedd81332 fix audio example on README.md 2014-12-03 21:59:27 -02:00
Can Geliş
6c39d07274 add tests 2014-11-16 21:28:14 +02:00
Can Geliş
b1778f0764 update stream parameters 2014-11-16 21:28:05 +02:00
Can Geliş
6507d1d021 add filter to the VideoFilters 2014-11-16 20:54:00 +02:00
Can Geliş
1d462b9eb3 add crop filter 2014-11-16 20:45:28 +02:00
sujayjaju
7bbd06876c Update AbstractData.php
Ability to set default return values when a property is not available in the probe results
2014-11-13 12:40:39 +05:30
sujayjaju
287afbf020 Update AbstractStreamableMedia.php
Annotation fix. getFormat() returns a Format.
2014-11-12 19:04:00 +05:30
Romain Neutron
c8949fe3df Update changelog 2014-08-26 10:46:56 +02:00
Romain Neutron
fc38decf08 Merge branch 'nlegoff-fix-aspect-ratio'
* nlegoff-fix-aspect-ratio:
  Fix video aspect ratio calculation
2014-08-26 10:46:02 +02:00
Romain Neutron
f2a6329829 Merge branch 'fix-aspect-ratio' of github.com:nlegoff/PHP-FFmpeg into nlegoff-fix-aspect-ratio
* 'fix-aspect-ratio' of github.com:nlegoff/PHP-FFmpeg:
  Fix video aspect ratio calculation
2014-08-26 10:45:33 +02:00
Nicolas Le Goff
c51ccf4f2c Fix video aspect ratio calculation 2014-08-25 20:36:05 +02:00
Romain Neutron
264ec57a90 Update docs 2014-08-13 20:36:30 +02:00
Romain Neutron
6098d4e2d3 Add missing namespace 2014-08-13 20:35:52 +02:00
Romain Neutron
3a0c6a1e1e Prepare version 0.5.0 2014-08-12 21:05:45 +02:00
Romain Neutron
da5e10adfc Prepare version 0.4.5 2014-08-12 21:01:39 +02:00
Romain Neutron
8423c26356 Update API doc 2014-08-12 21:01:07 +02:00