Declare ffmpeg binary in composer.json

This commit is contained in:
Pierre Rudloff 2015-11-21 20:54:38 +01:00
parent cafb75a9c1
commit c74623a9dd
4 changed files with 11 additions and 5 deletions

View file

@ -31,7 +31,7 @@ Class Config
public $python = '/usr/bin/python'; public $python = '/usr/bin/python';
public $params = '--no-playlist --no-warnings -f best'; public $params = '--no-playlist --no-warnings -f best';
public $convert = false; public $convert = false;
public $avconv = 'vendor/ffmpeg/ffmpeg/ffmpeg'; public $avconv = 'vendor/bin/ffmpeg';
/** /**
* Config constructor * Config constructor

View file

@ -44,7 +44,10 @@
"dist": { "dist": {
"url": "http://johnvansickle.com/ffmpeg/releases/ffmpeg-release-64bit-static.tar.xz", "url": "http://johnvansickle.com/ffmpeg/releases/ffmpeg-release-64bit-static.tar.xz",
"type": "xz" "type": "xz"
} },
"bin": [
"ffmpeg"
]
} }
} }
], ],

7
composer.lock generated
View file

@ -4,8 +4,8 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
"This file is @generated automatically" "This file is @generated automatically"
], ],
"hash": "f0413ea9f5a3839553b545d6f8d97a04", "hash": "a4d07c0b568b699f11966a06bb02c01a",
"content-hash": "17101d634f04111528073e6c9e5dcb8c", "content-hash": "d44f2b04ee42d003e6c04dbde30106c5",
"packages": [ "packages": [
{ {
"name": "ffmpeg/ffmpeg", "name": "ffmpeg/ffmpeg",
@ -16,6 +16,9 @@
"reference": null, "reference": null,
"shasum": null "shasum": null
}, },
"bin": [
"ffmpeg"
],
"type": "library" "type": "library"
}, },
{ {

View file

@ -2,4 +2,4 @@ youtubedl: vendor/rg3/youtube-dl/youtube_dl/__main__.py
python: /usr/bin/python python: /usr/bin/python
params: --no-playlist --no-warnings -f best params: --no-playlist --no-warnings -f best
convert: false convert: false
avconv: vendor/ffmpeg/ffmpeg/ffmpeg avconv: vendor/bin/ffmpeg