ffmpeg-mappable-media

dan/ffmpeg-mappable-media

Fork 0

Commit graph

06d8031b9d Update github templates Patrik Karisch 2016-03-23 07:57:05 +01:00
a1e12ecf33 Merge pull request #209 from PHP-FFMpeg/enhancement/changelog Patrik Karisch 2016-03-11 01:26:35 +01:00
d1c60d29d8 Updated changelog to follow keepachangelog.com style Patrik Karisch 2016-03-09 22:09:51 +01:00
7770b0e361 Merge pull request #207 from PHP-FFMpeg/enhancement/issue-template Patrik Karisch 2016-03-09 20:43:04 +01:00
b191285930 Add a meaningful issue template Patrik Karisch 2016-03-07 00:51:04 +01:00
48d40cd9c6 Merge pull request #206 from PHP-FFMpeg/enhancement/pull-request-template Patrik Karisch 2016-03-09 00:52:28 +01:00
16ee22dc65 Add a meaningful pull request template Patrik Karisch 2016-03-07 00:39:23 +01:00
7687be530c Update changelog Patrik Karisch 2016-03-08 01:47:06 +01:00
be7b75daad Merge pull request #205 from PHP-FFMpeg/enhancement/improve-test-suite Patrik Karisch 2016-03-07 00:19:23 +01:00
232db3ce40 Build pushes only on master and pull requests only Patrik Karisch 2016-03-07 00:10:47 +01:00
fa0581b468 Improve travis builds and test PHP 7.0 and HHVM (with allow failures) Patrik Karisch 2016-03-06 23:43:03 +01:00
f9c6316bad Cleanup phpunit configs and PSR-4 autoloading and namespaces for tests Patrik Karisch 2016-03-06 23:38:04 +01:00
d4db96662c Cleanup composer, ignore lock, add me as a maintainer to the authors ;) Patrik Karisch 2016-03-06 23:19:40 +01:00
bd61d8d35e Remove unused statement Ha Phan 2015-09-06 13:24:31 +08:00
1fee6fb4be Add missing getter $currentTime Ha Phan 2015-09-06 13:24:21 +08:00
f765864749 Fix test URL Romain Neutron 2016-03-05 18:03:41 +01:00
4a76e96cb9 Merge pull request #204 from patkar/enhancement/evenenment-v2 Romain Neutron 2016-03-05 18:00:13 +01:00
46394564a5 Allow usage of evenement v2.0 Patrik Karisch 2016-03-02 03:18:02 +01:00
8b41673cf3 Update AspectRatio.php hanserdev 2015-03-04 00:36:03 +01:00
6e3134e4ec Update changelog Romain Neutron 2015-01-30 20:07:38 +01:00
f62077ab64 gnéééé Romain Neutron 2015-01-30 20:05:30 +01:00
559708c0e4 Merge pull request #134 from cangelis/cropfilter Romain Neutron 2015-01-30 20:03:31 +01:00
0736141e16 Use latest fix Romain Neutron 2015-01-30 19:59:13 +01:00
92121bb804 Merge branch 'patch-2' of github.com:sujayjaju/PHP-FFMpeg into sujayjaju-patch-2 Romain Neutron 2015-01-30 19:54:33 +01:00
863fd1b70f Fix file name Romain Neutron 2015-01-30 19:52:57 +01:00
5c20397b64 Add exception if invalid file Romain Neutron 2015-01-30 19:48:00 +01:00
6cd008128c Merge branch 'patch-3' of github.com:sujayjaju/PHP-FFMpeg into sujayjaju-patch-3 Romain Neutron 2015-01-30 19:45:21 +01:00
303a04cff6 Merge pull request #139 from sujayjaju/patch-4 Romain Neutron 2015-01-30 19:44:31 +01:00
4b8519270d Support for libfdk_aac sujayjaju 2014-12-11 20:55:21 +05:30
95fa854c3e Use watermark image while watermarking! sujayjaju 2014-12-11 16:40:59 +05:30
0599ff4def Merge pull request #131 from sujayjaju/patch-1 Romain Neutron 2014-12-04 19:51:40 +01:00
cba1ff9c67 Merge pull request #136 from diego-vieira/master Romain Neutron 2014-12-04 19:43:26 +01:00
fcedd81332 fix audio example on README.md Diego 2014-12-03 21:59:27 -02:00
6c39d07274 add tests Can Geliş 2014-11-16 21:28:14 +02:00
b1778f0764 update stream parameters Can Geliş 2014-11-16 21:28:05 +02:00
6507d1d021 add filter to the VideoFilters Can Geliş 2014-11-16 20:54:00 +02:00
1d462b9eb3 add crop filter Can Geliş 2014-11-16 20:45:28 +02:00
7bbd06876c Update AbstractData.php sujayjaju 2014-11-13 12:40:39 +05:30
287afbf020 Update AbstractStreamableMedia.php sujayjaju 2014-11-12 19:04:00 +05:30
c8949fe3df Update changelog Romain Neutron 2014-08-26 10:46:56 +02:00
fc38decf08 Merge branch 'nlegoff-fix-aspect-ratio' Romain Neutron 2014-08-26 10:46:02 +02:00
f2a6329829 Merge branch 'fix-aspect-ratio' of github.com:nlegoff/PHP-FFmpeg into nlegoff-fix-aspect-ratio Romain Neutron 2014-08-26 10:45:33 +02:00
c51ccf4f2c Fix video aspect ratio calculation Nicolas Le Goff 2014-06-10 12:27:04 +02:00
264ec57a90 Update docs Romain Neutron 2014-08-13 20:36:30 +02:00
6098d4e2d3 Add missing namespace Romain Neutron 2014-08-13 20:35:52 +02:00
3a0c6a1e1e Prepare version 0.5.0 Romain Neutron 2014-08-12 21:05:45 +02:00
da5e10adfc Prepare version 0.4.5 Romain Neutron 2014-08-12 21:01:39 +02:00
8423c26356 Update API doc Romain Neutron 2014-08-12 21:01:07 +02:00
d61a491f13 Merge branch 'SimonSimCity-master' Romain Neutron 2014-08-12 20:54:49 +02:00
b1a34d9e35 Update changelog Romain Neutron 2014-08-12 20:54:37 +02:00
c1993b6b92 Merge branch 'master' of github.com:SimonSimCity/PHP-FFMpeg into SimonSimCity-master Romain Neutron 2014-08-12 20:53:47 +02:00
90a6ab7c1d Update changelog Romain Neutron 2014-08-12 20:52:38 +02:00
2da17ba59b Merge branch 'letsface-feature/custom-filter' Romain Neutron 2014-08-12 20:51:31 +02:00
559df352c5 Minor fixes Romain Neutron 2014-08-12 20:51:22 +02:00
3a080613e6 Fix CS Romain Neutron 2014-08-12 20:49:42 +02:00
4d2e891b59 Merge pull request #2 from mhor/check_style_cs_fixer Simon Schick 2014-08-09 10:27:30 +02:00
ac767875a6 checkstyle by php-cs-fixer mhor 2014-08-08 23:50:33 +02:00
634e67d7ec Allow to set bframe support in a format sylvainv 2014-08-01 00:03:13 +08:00
72d7a8c236 Added custom filter support sylvainv 2014-07-30 17:59:55 +08:00
475d1a508a Added watermark functionality and unit tests sylvainv 2014-07-28 17:27:12 +08:00
8a27b77dcb Merge pull request #113 from ryo-utsunomiya/patch-2 Romain Neutron 2014-07-18 01:40:57 -07:00
7fe6dcf542 Fix Doc comment (width => integer) Ryo Utsunomiya 2014-07-18 14:19:50 +09:00
7004e53399 Added configuration for audio channels Simon Schick 2014-06-25 09:55:00 +02:00
5bc3da7bda Merge pull request #108 from ryo-utsunomiya/patch-1 Romain Neutron 2014-06-11 13:45:43 +02:00
c2cae8de18 Add 'use FFMpeg\Coordinate\TimeCode;' Ryo Utsunomiya 2014-06-11 19:34:14 +09:00
aec1c67178 Merge branch '0.4' Romain Neutron 2014-06-03 12:49:57 +02:00
460a035697 Fixed sample for duration and added sample for codec_name Simon Schick 2014-06-03 09:47:27 +02:00
425a520480 Merge pull request #104 from SimonSimCity/patch-1 Romain Neutron 2014-06-03 12:48:43 +02:00
521c708290 Fixed sample for duration and added sample for codec_name Simon Schick 2014-06-03 09:47:27 +02:00
4bea49478c Remove todos Romain Neutron 2014-05-17 12:35:05 +02:00
9826c6d88c Update changelog Romain Neutron 2014-04-21 19:23:57 +02:00
7bff8d0d95 Merge pull request #95 from MrHash/master Romain Neutron 2014-04-21 19:22:27 +02:00
5211e58dc9 Support for Wav and Aac audio encoding MrHash 2014-04-21 14:09:32 +01:00
62763adae5 Merge branch '0.4' Romain Neutron 2014-03-19 08:25:50 +01:00
93b0c348cf Remove unreachable code Romain Neutron 2014-03-19 00:24:36 -07:00
c3d7d18f5b Remove unreachable code Romain Neutron 2014-03-19 00:24:36 -07:00
4ebd4a0166 Update Travis icon Romain Neutron 2014-02-28 00:23:32 +01:00
b9a908e889 Update travis icon Romain Neutron 2014-02-28 00:22:46 +01:00
8f4b89e952 Merge pull request #83 from GrahamCampbell/travis Romain Neutron 2014-02-24 10:17:30 +01:00
95acb2e21f Travis improvements Graham Campbell 2014-02-23 12:05:41 +00:00
551d45ab5d Remove sphinx install Romain Neutron 2013-12-25 13:18:17 +01:00
580421ab5f Merge branch '0.4' Romain Neutron 2013-12-17 17:55:39 +01:00
8dfaf18158 Merge pull request #81 from alchemy-fr/fix-dimensions Romain Neutron 2013-12-17 08:54:46 -08:00
197b534359 Fix CS Romain Neutron 2013-12-17 17:39:24 +01:00
9dd5dec9fd Update Changelog Romain Neutron 2013-12-17 17:38:54 +01:00
c4fcee4517 Fix width / height detection Romain Neutron 2013-12-17 17:38:12 +01:00
f3893b9459 Merge branch '0.4' Romain Neutron 2013-12-02 14:48:38 +01:00
554cec2bc7 Prepare version 0.4.3 Romain Neutron 2013-12-02 14:48:20 +01:00
f47cf9f008 Merge pull request #79 from alchemy-fr/fix-78 Romain Neutron 2013-12-02 05:26:23 -08:00
18abae55a9 Fix compatibility with avconv 0.9 Romain Neutron 2013-12-02 12:47:27 +01:00
fca866e1d8 Fix using rotate and resize filters at the same time (#78) Romain Neutron 2013-11-29 13:25:49 +01:00
4db04f70e4 Merge branch '0.4' Romain Neutron 2013-11-29 11:38:54 +01:00
5a9d4a0f04 Update README Romain Neutron 2013-11-29 11:38:16 +01:00
e92fc312cd Merge pull request #77 from alchemy-fr/file-restrictions Romain Neutron 2013-11-29 02:27:07 -08:00
ad2b9e75a5 Fix #76 : Remove restriction on filesystem resources Romain Neutron 2013-11-29 11:14:49 +01:00
a875227591 Fix tests Romain Neutron 2013-11-28 18:49:13 +01:00
7ede8579c6 Remove time_start metadata when using synchronize filter Romain Neutron 2013-11-28 18:39:28 +01:00
7d99f161cd Merge pull request #75 from alchemy-fr/rotate Romain Neutron 2013-11-28 08:49:11 -08:00
6948e263ff Add a rotate filter (fix #15) Romain Neutron 2013-11-28 15:33:57 +01:00
854ede7737 Bump to version 0.5-dev Romain Neutron 2013-11-26 23:37:53 +01:00