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
Romain Neutron
d61a491f13
Merge branch 'SimonSimCity-master'
...
* SimonSimCity-master:
Update changelog
checkstyle by php-cs-fixer
Added configuration for audio channels
2014-08-12 20:54:49 +02:00
Romain Neutron
b1a34d9e35
Update changelog
2014-08-12 20:54:37 +02:00
Romain Neutron
c1993b6b92
Merge branch 'master' of github.com:SimonSimCity/PHP-FFMpeg into SimonSimCity-master
...
* 'master' of github.com:SimonSimCity/PHP-FFMpeg:
checkstyle by php-cs-fixer
Added configuration for audio channels
2014-08-12 20:53:47 +02:00
Romain Neutron
90a6ab7c1d
Update changelog
2014-08-12 20:52:38 +02:00
Romain Neutron
2da17ba59b
Merge branch 'letsface-feature/custom-filter'
...
* letsface-feature/custom-filter:
Minor fixes
Fix CS
Allow to set bframe support in a format
Added custom filter support
Added watermark functionality and unit tests
Fix Doc comment (width => integer)
Add 'use FFMpeg\Coordinate\TimeCode;'
2014-08-12 20:51:31 +02:00
Romain Neutron
559df352c5
Minor fixes
2014-08-12 20:51:22 +02:00
Romain Neutron
3a080613e6
Fix CS
2014-08-12 20:49:42 +02:00
Simon Schick
4d2e891b59
Merge pull request #2 from mhor/check_style_cs_fixer
...
checkstyle by php-cs-fixer
2014-08-09 10:27:30 +02:00
mhor
ac767875a6
checkstyle by php-cs-fixer
2014-08-08 23:50:33 +02:00
sylvainv
634e67d7ec
Allow to set bframe support in a format
2014-08-01 00:03:13 +08:00
sylvainv
72d7a8c236
Added custom filter support
2014-07-30 18:01:39 +08:00
sylvainv
475d1a508a
Added watermark functionality and unit tests
2014-07-28 17:27:12 +08:00
Romain Neutron
8a27b77dcb
Merge pull request #113 from ryo-utsunomiya/patch-2
...
Fix Doc comment (width => integer)
2014-07-18 01:40:57 -07:00
Ryo Utsunomiya
7fe6dcf542
Fix Doc comment (width => integer)
2014-07-18 14:19:50 +09:00
Simon Schick
7004e53399
Added configuration for audio channels
2014-06-25 10:21:59 +02:00
Romain Neutron
5bc3da7bda
Merge pull request #108 from ryo-utsunomiya/patch-1
...
Add 'use FFMpeg\Coordinate\TimeCode;'
2014-06-11 13:45:43 +02:00
Ryo Utsunomiya
c2cae8de18
Add 'use FFMpeg\Coordinate\TimeCode;'
...
Because the namespace FFMpeg\Coordinate\TimeCode is not imported, IDE's inspector raise warning when VideoFilters::clip() is used.
2014-06-11 19:34:14 +09:00
Romain Neutron
aec1c67178
Merge branch '0.4'
2014-06-03 12:49:57 +02:00
Simon Schick
460a035697
Fixed sample for duration and added sample for codec_name
...
I've updated the README file, because the existing example for getting the duration of a file was not working for file-types like WebM (see #103 ).
To not to loose the sample that was already in place, I changed it to return the codec-name for the video. Maybe returning width or height of a video is more used, but we can't have a sample for all ;)
2014-06-03 12:49:31 +02:00
Romain Neutron
425a520480
Merge pull request #104 from SimonSimCity/patch-1
...
Fixed sample for duration and added sample for codec_name
2014-06-03 12:48:43 +02:00
Simon Schick
521c708290
Fixed sample for duration and added sample for codec_name
...
I've updated the README file, because the existing example for getting the duration of a file was not working for file-types like WebM (see #103 ).
To not to loose the sample that was already in place, I changed it to return the codec-name for the video. Maybe returning width or height of a video is more used, but we can't have a sample for all ;)
2014-06-03 09:47:27 +02:00
Romain Neutron
4bea49478c
Remove todos
2014-05-17 12:35:05 +02:00
Romain Neutron
9826c6d88c
Update changelog
2014-04-21 19:23:57 +02:00
Romain Neutron
7bff8d0d95
Merge pull request #95 from MrHash/master
...
Support for Wav and Aac audio encoding
2014-04-21 19:22:27 +02:00
MrHash
5211e58dc9
Support for Wav and Aac audio encoding
2014-04-21 14:09:32 +01:00
Romain Neutron
62763adae5
Merge branch '0.4'
2014-03-19 08:25:50 +01:00
Romain Neutron
93b0c348cf
Remove unreachable code
2014-03-19 08:25:37 +01:00
Romain Neutron
c3d7d18f5b
Remove unreachable code
2014-03-19 00:24:36 -07:00
Romain Neutron
4ebd4a0166
Update Travis icon
2014-02-28 00:23:32 +01:00
Romain Neutron
b9a908e889
Update travis icon
2014-02-28 00:22:46 +01:00
Romain Neutron
8f4b89e952
Merge pull request #83 from GrahamCampbell/travis
...
Travis Improvements
2014-02-24 10:17:30 +01:00
