From a4389340b822ac8cae051811d838b6c607f88dbd Mon Sep 17 00:00:00 2001 From: =?utf8?q?Thomas=20M=C3=BCller?= Date: Wed, 16 Apr 2014 19:45:55 +0200 Subject: [PATCH] escape $second + update PHPDoc --- lib/private/preview/movies.php | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/lib/private/preview/movies.php b/lib/private/preview/movies.php index ed28a03afab..72ccfadc6e9 100644 --- a/lib/private/preview/movies.php +++ b/lib/private/preview/movies.php @@ -65,11 +65,11 @@ if (!\OC_Util::runningOnWindows()) { } /** - * @param $maxX - * @param $maxY - * @param $absPath - * @param $tmpPath - * @param $second + * @param int $maxX + * @param int $maxY + * @param string $absPath + * @param string $tmpPath + * @param int $second * @return bool|\OC_Image */ private function generateThumbNail($maxX, $maxY, $absPath, $second) @@ -77,12 +77,12 @@ if (!\OC_Util::runningOnWindows()) { $tmpPath = \OC_Helper::tmpFile(); if (self::$avconvBinary) { - $cmd = self::$avconvBinary . ' -an -y -ss ' . $second . + $cmd = self::$avconvBinary . ' -an -y -ss ' . escapeshellarg($second) . ' -i ' . escapeshellarg($absPath) . ' -f mjpeg -vframes 1 -vsync 1 ' . escapeshellarg($tmpPath) . ' > /dev/null 2>&1'; } else { - $cmd = self::$ffmpegBinary . ' -y -ss ' .$second . + $cmd = self::$ffmpegBinary . ' -y -ss ' . escapeshellarg($second) . ' -i ' . escapeshellarg($absPath) . ' -f mjpeg -vframes 1' . ' -s ' . escapeshellarg($maxX) . 'x' . escapeshellarg($maxY) . -- 2.39.5