From d15f1882f91c4ab71c8a41f62f5277bff5fa4ea6 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Thu, 20 Nov 2014 12:41:55 +0100
Subject: Simplify the binary finding code in the movie preview class

---
 lib/private/preview/movies.php | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

(limited to 'lib/private/preview')

diff --git a/lib/private/preview/movies.php b/lib/private/preview/movies.php
index 8217ad24409..d69266ceb33 100644
--- a/lib/private/preview/movies.php
+++ b/lib/private/preview/movies.php
@@ -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;
-
-	if ($isExecEnabled) {
-		$avconvBinary = \OC_Helper::findBinaryPath('avconv');
-		if (!$avconvBinary) {
-			$ffmpegBinary = \OC_Helper::findBinaryPath('ffmpeg');
-		}
-	}
+	$avconvBinary = \OC_Helper::findBinaryPath('avconv');
+	$ffmpegBinary = ($avconvBinary) ? null : \OC_Helper::findBinaryPath('ffmpeg');
 
-	if($isExecEnabled && ( $avconvBinary || $ffmpegBinary )) {
+	if ($avconvBinary || $ffmpegBinary) {
 
 		class Movie extends Provider {
 			public static $avconvBinary;
-- 
cgit v1.2.3