Simplify the binary finding code in the movie preview class

diff --git a/lib/private/preview/movies.php b/lib/private/preview/movies.php
index 8217ad2440939e8138170b3d361575911eecf448..d69266ceb33b70bd6837fad876c1cb8a6c63d7e5 100644 (file)
--- 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;