diff --git a/classes/Config.php b/classes/Config.php index dcd7f8e..8cca186 100644 --- a/classes/Config.php +++ b/classes/Config.php @@ -31,7 +31,7 @@ Class Config public $python = '/usr/bin/python'; public $params = '--no-playlist --no-warnings -f best'; public $convert = false; - public $avconv = 'vendor/ffmpeg/ffmpeg/ffmpeg'; + public $avconv = 'vendor/bin/ffmpeg'; /** * Config constructor diff --git a/composer.json b/composer.json index 5abc2e0..bd22e94 100644 --- a/composer.json +++ b/composer.json @@ -44,7 +44,10 @@ "dist": { "url": "http://johnvansickle.com/ffmpeg/releases/ffmpeg-release-64bit-static.tar.xz", "type": "xz" - } + }, + "bin": [ + "ffmpeg" + ] } } ], diff --git a/composer.lock b/composer.lock index 95b0ef1..57950e6 100644 --- a/composer.lock +++ b/composer.lock @@ -4,8 +4,8 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "hash": "f0413ea9f5a3839553b545d6f8d97a04", - "content-hash": "17101d634f04111528073e6c9e5dcb8c", + "hash": "a4d07c0b568b699f11966a06bb02c01a", + "content-hash": "d44f2b04ee42d003e6c04dbde30106c5", "packages": [ { "name": "ffmpeg/ffmpeg", @@ -16,6 +16,9 @@ "reference": null, "shasum": null }, + "bin": [ + "ffmpeg" + ], "type": "library" }, { diff --git a/config.example.yml b/config.example.yml index 067d6cc..b0c7301 100644 --- a/config.example.yml +++ b/config.example.yml @@ -2,4 +2,4 @@ youtubedl: vendor/rg3/youtube-dl/youtube_dl/__main__.py python: /usr/bin/python params: --no-playlist --no-warnings -f best convert: false -avconv: vendor/ffmpeg/ffmpeg/ffmpeg +avconv: vendor/bin/ffmpeg