diff options
| author | William <william.hak57@gmail.com> | 2023-01-18 16:30:41 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-01-18 16:30:41 +0100 |
| commit | 1409a7cc926b00674a9e2ada2d38d1cbbd0e91eb (patch) | |
| tree | 33a4e955442d60c80b03cd12fe80da782acbb177 /lib/private | |
| parent | 9e08e4999821a0cf7c6b08fd9ab05f8d057c8362 (diff) | |
| download | nextcloud-server-1409a7cc926b00674a9e2ada2d38d1cbbd0e91eb.tar.gz nextcloud-server-1409a7cc926b00674a9e2ada2d38d1cbbd0e91eb.zip | |
Update PreviewManager.php
add a check in config.php for a configured movieBinary path.
so now it first checks in config.php if preview_ffmpeg_path is configured.
Signed-off-by: William <william.hak57@gmail.com>
Diffstat (limited to 'lib/private')
| -rw-r--r-- | lib/private/PreviewManager.php | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/lib/private/PreviewManager.php b/lib/private/PreviewManager.php index 87e709e9bcc..eac3f40efc2 100644 --- a/lib/private/PreviewManager.php +++ b/lib/private/PreviewManager.php @@ -417,11 +417,16 @@ class PreviewManager implements IPreview { // Video requires avconv or ffmpeg if (in_array(Preview\Movie::class, $this->getEnabledDefaultProvider())) { - $movieBinary = $this->binaryFinder->findBinaryPath('avconv'); - if (!is_string($movieBinary)) { - $movieBinary = $this->binaryFinder->findBinaryPath('ffmpeg'); + + $movieBinary = $this->config->getSystemValue('preview_ffmpeg_path', null); + if(!is_string($movieBinary)){ + $movieBinary = $this->binaryFinder->findBinaryPath('avconv'); + if (!is_string($movieBinary)) { + $movieBinary = $this->binaryFinder->findBinaryPath('ffmpeg'); + } } + if (is_string($movieBinary)) { $this->registerCoreProvider(Preview\Movie::class, '/video\/.*/', ["movieBinary" => $movieBinary]); } |