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

Fix #1598 #1599 : Fix support for portrait videos.

Browse Source
This commit is contained in:
Romain Neutron
2013-12-02 15:13:53 +01:00
parent 5504f9013a
commit 900c62cb84
2 changed files with 20 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
composer.json
View File

@@ -21,7 +21,7 @@
"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" : "~0.4.0",
"media-alchemyst/media-alchemyst" : "~0.3.1", "media-alchemyst/media-alchemyst" : "~0.4, >=0.4.3",
"monolog/monolog" : "~1.3.0", "monolog/monolog" : "~1.3.0",
"mrclay/minify" : "~2.1.6", "mrclay/minify" : "~2.1.6",
"neutron/silex-imagine-provider" : "~0.1.0", "neutron/silex-imagine-provider" : "~0.1.0",
@@ -29,6 +29,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-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",

36
composer.lock generated
View File

@@ -3,7 +3,7 @@
"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"
], ],
"hash": "c86f3d5cef410e011d14c7ac9749c11e", "hash": "329db4f5834432a8ebc2c25c3447381d",
"packages": [ "packages": [
{ {
"name": "alchemy-fr/tcpdf-clone", "name": "alchemy-fr/tcpdf-clone",
@@ -1434,26 +1434,26 @@
}, },
{ {
"name": "media-alchemyst/media-alchemyst", "name": "media-alchemyst/media-alchemyst",
"version": "0.3.6", "version": "0.4.3",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/alchemy-fr/Media-Alchemyst.git", "url": "https://github.com/alchemy-fr/Media-Alchemyst.git",
"reference": "86a16aab82b6e31d2e70050f61fa815a98037253" "reference": "319f55c2265a9056d68f1f0e6314dce977ef47ef"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/alchemy-fr/Media-Alchemyst/zipball/86a16aab82b6e31d2e70050f61fa815a98037253", "url": "https://api.github.com/repos/alchemy-fr/Media-Alchemyst/zipball/319f55c2265a9056d68f1f0e6314dce977ef47ef",
"reference": "86a16aab82b6e31d2e70050f61fa815a98037253", "reference": "319f55c2265a9056d68f1f0e6314dce977ef47ef",
"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.0", "mediavorus/mediavorus": "~0.4.2",
"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.3, >=0.3.4", "php-ffmpeg/php-ffmpeg": "~0.4.2",
"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",
@@ -1503,20 +1503,20 @@
"video", "video",
"video processing" "video processing"
], ],
"time": "2013-10-21 12:41:18" "time": "2013-12-03 17:07:51"
}, },
{ {
"name": "mediavorus/mediavorus", "name": "mediavorus/mediavorus",
"version": "0.4.1", "version": "0.4.2",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/romainneutron/MediaVorus.git", "url": "https://github.com/romainneutron/MediaVorus.git",
"reference": "5d5c416353f48192f2202dd4be5c21d95f46b08d" "reference": "b80ab6acd79f69b2040f7915e1393f08f68277fc"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/romainneutron/MediaVorus/zipball/5d5c416353f48192f2202dd4be5c21d95f46b08d", "url": "https://api.github.com/repos/romainneutron/MediaVorus/zipball/b80ab6acd79f69b2040f7915e1393f08f68277fc",
"reference": "5d5c416353f48192f2202dd4be5c21d95f46b08d", "reference": "b80ab6acd79f69b2040f7915e1393f08f68277fc",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@@ -1564,7 +1564,7 @@
"keywords": [ "keywords": [
"metadata" "metadata"
], ],
"time": "2013-10-21 12:36:49" "time": "2013-11-28 16:41:54"
}, },
{ {
"name": "monolog/monolog", "name": "monolog/monolog",
@@ -1887,16 +1887,16 @@
}, },
{ {
"name": "php-ffmpeg/php-ffmpeg", "name": "php-ffmpeg/php-ffmpeg",
"version": "0.4.0", "version": "0.4.3",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/alchemy-fr/PHP-FFmpeg.git", "url": "https://github.com/alchemy-fr/PHP-FFmpeg.git",
"reference": "0d82e5ad3cb50fd78882b5e15aaf57b39a274103" "reference": "554cec2bc7b76e222aeef083205ed3bd57327975"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/alchemy-fr/PHP-FFmpeg/zipball/0d82e5ad3cb50fd78882b5e15aaf57b39a274103", "url": "https://api.github.com/repos/alchemy-fr/PHP-FFmpeg/zipball/554cec2bc7b76e222aeef083205ed3bd57327975",
"reference": "0d82e5ad3cb50fd78882b5e15aaf57b39a274103", "reference": "554cec2bc7b76e222aeef083205ed3bd57327975",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@@ -1952,7 +1952,7 @@
"video", "video",
"video processing" "video processing"
], ],
"time": "2013-10-21 12:16:28" "time": "2013-12-02 13:48:20"
}, },
{ {
"name": "php-mp4box/php-mp4box", "name": "php-mp4box/php-mp4box",