hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-18 07:23:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1106 from nlegoff/fix-video-anamorphosis

Browse Source 
[3.8.4] Fix video anamorphosis
This commit is contained in:
Nicolas Le Goff
2014-06-11 12:12:31 +02:00
parent 6e44dab3b1 b825ccc5d8
commit bc707ffdee
2 changed files with 71 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
composer.json
View File

@@ -5,6 +5,25 @@
"config": { "config": {
"bin-dir" : "bin/" "bin-dir" : "bin/"
}, },
"repositories": [
{
"type": "vcs",
"url": "https://github.com/alchemy-fr/tcpdf-clone"
},
{
"type": "vcs",
"url": "https://github.com/nlegoff/PHP-FFmpeg"
},
{
"type": "vcs",
"url": "https://github.com/nlegoff/Mediavorus"
},
{
"type": "vcs",
"url": "https://github.com/nlegoff/Media-Alchemyst"
}
],
"minimum-stability" : "dev",
"require": { "require": {
"php" : ">=5.3.3", "php" : ">=5.3.3",
"alchemy/oauth2php" : "1.0.0", "alchemy/oauth2php" : "1.0.0",
@@ -21,8 +40,8 @@
"imagine/imagine" : "0.6.x-dev@dev", "imagine/imagine" : "0.6.x-dev@dev",
"jms/serializer" : "~0.10", "jms/serializer" : "~0.10",
"justinrainbow/json-schema" : "~1.3", "justinrainbow/json-schema" : "~1.3",
"mediavorus/mediavorus" : "~0.4.0", "mediavorus/mediavorus" : "dev-fix-video-dim as 0.4.3",
"media-alchemyst/media-alchemyst" : "~0.4, >=0.4.4", "media-alchemyst/media-alchemyst" : "0.4.x@dev",
"monolog/monolog" : "~1.3", "monolog/monolog" : "~1.3",
"mrclay/minify" : "~2.1.6", "mrclay/minify" : "~2.1.6",
"neutron/silex-imagine-provider" : "~0.1.0", "neutron/silex-imagine-provider" : "~0.1.0",
@@ -30,7 +49,7 @@
"neutron/sphinxsearch-api" : "~2.0.6", "neutron/sphinxsearch-api" : "~2.0.6",
"neutron/recaptcha" : "~0.1.0", "neutron/recaptcha" : "~0.1.0",
"neutron/temporary-filesystem" : "~2.1", "neutron/temporary-filesystem" : "~2.1",
"php-ffmpeg/php-ffmpeg" : "~0.4, >=0.4.3", "php-ffmpeg/php-ffmpeg" : "dev-fix-aspect-ratio as 0.4.4",
"php-xpdf/php-xpdf" : "~0.2.1", "php-xpdf/php-xpdf" : "~0.2.1",
"phpexiftool/phpexiftool" : "~0.3", "phpexiftool/phpexiftool" : "~0.3",
"silex/silex" : "~1.0.0", "silex/silex" : "~1.0.0",
@@ -54,12 +73,6 @@
"behat/mink-selenium2-driver" : "~1.0", "behat/mink-selenium2-driver" : "~1.0",
"fabpot/goutte" : "~1.0" "fabpot/goutte" : "~1.0"
}, },
"repositories": [
{
"type": "git",
"url": "https://github.com/alchemy-fr/tcpdf-clone"
}
],
"autoload": { "autoload": {
"psr-0": { "psr-0": {
"" : "lib/classes", "" : "lib/classes",

77
composer.lock generated
View File

@@ -1,9 +1,10 @@
{ {
"_readme": [ "_readme": [
"This file locks the dependencies of your project to a known state", "This file locks the dependencies of your project to a known state",
"Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file" "Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
"This file is @generated automatically"
], ],
"hash": "2b68364c4ebb09b6f5c3902e0afdcc1a", "hash": "6dbba3e72a44255a6292ee8fedbce88e",
"packages": [ "packages": [
{ {
"name": "alchemy-fr/tcpdf-clone", "name": "alchemy-fr/tcpdf-clone",
@@ -1491,26 +1492,26 @@
}, },
{ {
"name": "media-alchemyst/media-alchemyst", "name": "media-alchemyst/media-alchemyst",
"version": "0.4.4", "version": "dev-master",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/alchemy-fr/Media-Alchemyst.git", "url": "https://github.com/nlegoff/Media-Alchemyst.git",
"reference": "067599fd669b86ff3a1cfb344730014b4a339b7e" "reference": "e812e631b74ebb0c7b3dd5f4e981d84a7b3c4029"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/alchemy-fr/Media-Alchemyst/zipball/067599fd669b86ff3a1cfb344730014b4a339b7e", "url": "https://api.github.com/repos/nlegoff/Media-Alchemyst/zipball/e812e631b74ebb0c7b3dd5f4e981d84a7b3c4029",
"reference": "067599fd669b86ff3a1cfb344730014b4a339b7e", "reference": "e812e631b74ebb0c7b3dd5f4e981d84a7b3c4029",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"alchemy/ghostscript": "~0.4.0", "alchemy/ghostscript": "~0.4.0",
"imagine/imagine": "0.6.x@dev", "imagine/imagine": "0.6.x@dev",
"mediavorus/mediavorus": "~0.4.2", "mediavorus/mediavorus": "dev-fix-video-dim as 0.4.3",
"monolog/monolog": "~1.0", "monolog/monolog": "~1.0",
"neutron/temporary-filesystem": "~2.1", "neutron/temporary-filesystem": "~2.1",
"php": ">=5.3.3", "php": ">=5.3.3",
"php-ffmpeg/php-ffmpeg": "~0.4.2", "php-ffmpeg/php-ffmpeg": "dev-fix-aspect-ratio as 0.4.4",
"php-mp4box/php-mp4box": "~0.3.0", "php-mp4box/php-mp4box": "~0.3.0",
"php-unoconv/php-unoconv": "~0.3.0", "php-unoconv/php-unoconv": "~0.3.0",
"pimple/pimple": "~1.0", "pimple/pimple": "~1.0",
@@ -1535,7 +1536,6 @@
"MediaAlchemyst": "src" "MediaAlchemyst": "src"
} }
}, },
"notification-url": "https://packagist.org/downloads/",
"license": [ "license": [
"MIT" "MIT"
], ],
@@ -1560,20 +1560,23 @@
"video", "video",
"video processing" "video processing"
], ],
"time": "2014-01-31 11:32:50" "support": {
"source": "https://github.com/nlegoff/Media-Alchemyst/tree/master"
},
"time": "2014-06-10 13:51:13"
}, },
{ {
"name": "mediavorus/mediavorus", "name": "mediavorus/mediavorus",
"version": "0.4.3", "version": "dev-fix-video-dim",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/romainneutron/MediaVorus.git", "url": "https://github.com/nlegoff/Mediavorus.git",
"reference": "7cc8c0b8d3440eaff9aa68fff2185216fd72bd75" "reference": "111a83e983e27818f0594c608d3b5252ffd915ec"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/romainneutron/MediaVorus/zipball/7cc8c0b8d3440eaff9aa68fff2185216fd72bd75", "url": "https://api.github.com/repos/nlegoff/Mediavorus/zipball/111a83e983e27818f0594c608d3b5252ffd915ec",
"reference": "7cc8c0b8d3440eaff9aa68fff2185216fd72bd75", "reference": "111a83e983e27818f0594c608d3b5252ffd915ec",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@@ -1606,7 +1609,6 @@
"MediaVorus": "src" "MediaVorus": "src"
} }
}, },
"notification-url": "https://packagist.org/downloads/",
"license": [ "license": [
"MIT" "MIT"
], ],
@@ -1621,7 +1623,10 @@
"keywords": [ "keywords": [
"metadata" "metadata"
], ],
"time": "2014-01-06 15:45:32" "support": {
"source": "https://github.com/nlegoff/Mediavorus/tree/fix-video-dim"
},
"time": "2014-06-10 09:39:00"
}, },
{ {
"name": "monolog/monolog", "name": "monolog/monolog",
@@ -1949,16 +1954,16 @@
}, },
{ {
"name": "php-ffmpeg/php-ffmpeg", "name": "php-ffmpeg/php-ffmpeg",
"version": "0.4.4", "version": "dev-fix-aspect-ratio",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/alchemy-fr/PHP-FFmpeg.git", "url": "https://github.com/nlegoff/PHP-FFmpeg.git",
"reference": "8dfaf1815802614352bbd10eac7299a100bf9757" "reference": "c2ea1ca7ab0a4da0e876e36c8cddbfa4d92dbba6"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/alchemy-fr/PHP-FFmpeg/zipball/8dfaf1815802614352bbd10eac7299a100bf9757", "url": "https://api.github.com/repos/nlegoff/PHP-FFmpeg/zipball/c2ea1ca7ab0a4da0e876e36c8cddbfa4d92dbba6",
"reference": "8dfaf1815802614352bbd10eac7299a100bf9757", "reference": "c2ea1ca7ab0a4da0e876e36c8cddbfa4d92dbba6",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@@ -1979,7 +1984,7 @@
"type": "library", "type": "library",
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "0.4-dev" "dev-master": "0.5-dev"
} }
}, },
"autoload": { "autoload": {
@@ -1987,7 +1992,6 @@
"FFMpeg": "src" "FFMpeg": "src"
} }
}, },
"notification-url": "https://packagist.org/downloads/",
"license": [ "license": [
"MIT" "MIT"
], ],
@@ -2014,7 +2018,10 @@
"video", "video",
"video processing" "video processing"
], ],
"time": "2013-12-17 16:54:46" "support": {
"source": "https://github.com/nlegoff/PHP-FFmpeg/tree/fix-aspect-ratio"
},
"time": "2014-06-10 10:27:04"
}, },
{ {
"name": "php-mp4box/php-mp4box", "name": "php-mp4box/php-mp4box",
@@ -4007,11 +4014,25 @@
} }
], ],
"aliases": [ "aliases": [
{
"alias": "0.4.3",
"alias_normalized": "0.4.3.0",
"version": "dev-fix-video-dim",
"package": "mediavorus/mediavorus"
},
{
"alias": "0.4.4",
"alias_normalized": "0.4.4.0",
"version": "dev-fix-aspect-ratio",
"package": "php-ffmpeg/php-ffmpeg"
}
], ],
"minimum-stability": "stable", "minimum-stability": "dev",
"stability-flags": { "stability-flags": {
"imagine/imagine": 20, "imagine/imagine": 20,
"mediavorus/mediavorus": 20,
"media-alchemyst/media-alchemyst": 20,
"php-ffmpeg/php-ffmpeg": 20,
"doctrine/data-fixtures": 20 "doctrine/data-fixtures": 20
}, },
"platform": { "platform": {