mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Simplify the binary finding code in the movie preview class

This commit is contained in:
Joas Schilling 2014-11-20 12:41:55 +01:00
parent 64421d76fd
commit d15f1882f9
1 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lib/private/preview/movies.php
View File

@ -10,18 +10,10 @@ namespace OC\Preview;
// movie preview is currently not supported on Windows
if (!\OC_Util::runningOnWindows()) {
$isExecEnabled = \OC_Helper::is_function_enabled('exec');
$ffmpegBinary = null;
$avconvBinary = null;
$avconvBinary = \OC_Helper::findBinaryPath('avconv');
$ffmpegBinary = ($avconvBinary) ? null : \OC_Helper::findBinaryPath('ffmpeg');
if ($isExecEnabled) {
$avconvBinary = \OC_Helper::findBinaryPath('avconv');
if (!$avconvBinary) {
$ffmpegBinary = \OC_Helper::findBinaryPath('ffmpeg');
}
}
if($isExecEnabled && ( $avconvBinary || $ffmpegBinary )) {
if ($avconvBinary || $ffmpegBinary) {
class Movie extends Provider {
public static $avconvBinary;