Commit graph

647 commits

Author SHA1 Message Date
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
Graham Campbell
95acb2e21f Travis improvements 2014-02-23 12:05:41 +00:00
Romain Neutron
551d45ab5d Remove sphinx install 2013-12-25 13:18:17 +01:00
Romain Neutron
580421ab5f Merge branch '0.4' 2013-12-17 17:55:39 +01:00
Romain Neutron
8dfaf18158 Merge pull request #81 from alchemy-fr/fix-dimensions
Fix dimensions
2013-12-17 08:54:46 -08:00
Romain Neutron
197b534359 Fix CS 2013-12-17 17:40:31 +01:00
Romain Neutron
9dd5dec9fd Update Changelog 2013-12-17 17:38:54 +01:00
Romain Neutron
c4fcee4517 Fix width / height detection 2013-12-17 17:38:12 +01:00
Romain Neutron
f3893b9459 Merge branch '0.4' 2013-12-02 14:48:38 +01:00
Romain Neutron
554cec2bc7 Prepare version 0.4.3 2013-12-02 14:48:20 +01:00
Romain Neutron
f47cf9f008 Merge pull request #79 from alchemy-fr/fix-78
Fix using rotate and resize filters at the same time (#78)
2013-12-02 05:26:23 -08:00
Romain Neutron
18abae55a9 Fix compatibility with avconv 0.9 2013-12-02 14:05:18 +01:00
Romain Neutron
fca866e1d8 Fix using rotate and resize filters at the same time (#78) 2013-11-29 14:21:21 +01:00
Romain Neutron
4db04f70e4 Merge branch '0.4' 2013-11-29 11:38:54 +01:00
Romain Neutron
5a9d4a0f04 Update README 2013-11-29 11:38:16 +01:00
Romain Neutron
e92fc312cd Merge pull request #77 from alchemy-fr/file-restrictions
Fix #76 : Remove restriction on filesystem resources
2013-11-29 02:27:07 -08:00
Romain Neutron
ad2b9e75a5 Fix #76 : Remove restriction on filesystem resources 2013-11-29 11:16:57 +01:00
Romain Neutron
a875227591 Fix tests 2013-11-28 18:49:13 +01:00
Romain Neutron
7ede8579c6 Remove time_start metadata when using synchronize filter 2013-11-28 18:39:28 +01:00
Romain Neutron
7d99f161cd Merge pull request #75 from alchemy-fr/rotate
Add a rotate filter (fix #15)
2013-11-28 08:49:11 -08:00
Romain Neutron
6948e263ff Add a rotate filter (fix #15) 2013-11-28 15:37:17 +01:00
Romain Neutron
854ede7737 Bump to version 0.5-dev 2013-11-26 23:37:53 +01:00
Romain Neutron
8fd4e23615 Update install instruction 2013-11-26 23:37:37 +01:00
Romain Neutron
59f6ffd32a Prepare version 0.4.1 2013-11-26 23:35:52 +01:00
Romain Neutron
fca01b0577 Fix #72 : Add audio and video bitrate settings examples 2013-11-21 10:48:09 +01:00
Romain Neutron
885618ec27 Update README.md 2013-11-13 00:06:17 +01:00
Romain Neutron
8178cccd59 Add insight badge 2013-11-13 00:05:50 +01:00
Romain Neutron
31c798c834 Fix file modes 2013-11-12 20:14:08 +01:00
Romain Neutron
7e66785b5d Merge branch 'master' of https://github.com/guimeira/PHP-FFmpeg into guimeira-master 2013-11-08 12:23:59 +01:00
Romain Neutron
0d82e5ad3c Prepare version 0.4.0 2013-10-21 14:16:28 +02:00
Romain Neutron
3a583ee913 Merge branch '0.3'
Conflicts:
	CHANGELOG.md
2013-10-21 14:15:55 +02:00
Romain Neutron
185fb5c33d Prepare version 0.3.5 2013-10-21 14:13:46 +02:00
Romain Neutron
ddf009b8a2 Fix changelog dates 2013-10-21 14:13:35 +02:00