diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2014-04-16 21:45:55 +0400 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2014-04-16 21:45:55 +0400 |
| commit | a4389340b822ac8cae051811d838b6c607f88dbd (patch) | |
| tree | 751f868e7bd8880049cb883669275eb141e170c7 /lib/private/preview | |
| parent | d0f8cc20c5c781d773b9d7c68e6f55e1f17e78c4 (diff) | |
escape $second + update PHPDoc
Diffstat (limited to 'lib/private/preview')
| -rw-r--r-- | lib/private/preview/movies.php | 14 |
1 files 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) . |