sascha
/
nextcloud-server
mirror of https://github.com/nextcloud/server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
pull/36225/head
William 2023-01-18 16:30:41 +07:00 committed by GitHub
parent 9e08e49998
commit 1409a7cc92
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lib/private/PreviewManager.php
Unescape Escape View File

@ -417,11 +417,16 @@ class PreviewManager implements IPreview {
// Video requires avconv or ffmpeg // Video requires avconv or ffmpeg
if (in_array(Preview\Movie::class, $this->getEnabledDefaultProvider())) { if (in_array(Preview\Movie::class, $this->getEnabledDefaultProvider())) {
$movieBinary = $this->binaryFinder->findBinaryPath('avconv');
if (!is_string($movieBinary)) { $movieBinary = $this->config->getSystemValue('preview_ffmpeg_path', null);
$movieBinary = $this->binaryFinder->findBinaryPath('ffmpeg'); if(!is_string($movieBinary)){
$movieBinary = $this->binaryFinder->findBinaryPath('avconv');
if (!is_string($movieBinary)) {
$movieBinary = $this->binaryFinder->findBinaryPath('ffmpeg');
}
} }
if (is_string($movieBinary)) { if (is_string($movieBinary)) {
$this->registerCoreProvider(Preview\Movie::class, '/video\/.*/', ["movieBinary" => $movieBinary]); $this->registerCoreProvider(Preview\Movie::class, '/video\/.*/', ["movieBinary" => $movieBinary]);
} }