dan/ffmpeg-mappable-media
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #27 from alchemy-fr/Latest

Browse source 
Update dependencies
This commit is contained in:
Romain Neutron 2013-02-07 03:11:35 -08:00
commit 1bdbf1af93
2 changed files with 1061 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

13
composer.json
View file

@ -18,27 +18,20 @@
], ],
"require": { "require": {
"php" : ">=5.3.3", "php" : ">=5.3.3",
"symfony/process": ">=2.0,<=2.2", "symfony/process" : "~2.0",
"monolog/monolog": "1.*" "monolog/monolog" : "~1.0"
}, },
"suggest": { "suggest": {
"php-ffmpeg/extras": "A compilation of common audio & video drivers for PHP-FFMpeg" "php-ffmpeg/extras": "A compilation of common audio & video drivers for PHP-FFMpeg"
}, },
"minimum-stability": "dev",
"require-dev": { "require-dev": {
"fabpot/php-cs-fixer": "master",
"sami/sami" : "dev-master", "sami/sami" : "dev-master",
"silex/silex" : "dev-master", "silex/silex" : "dev-master",
"phpunit/phpunit": "3.7.*" "phpunit/phpunit" : "~3.7"
}, },
"autoload": { "autoload": {
"psr-0": { "psr-0": {
"FFMpeg": "src" "FFMpeg": "src"
} }
},
"extra": {
"branch-alias": {
"dev-master": "0.2.x-dev"
}
} }
} }

1079
composer.lock generated
View file

File diff suppressed because it is too large Load diff