diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2013-09-09 12:32:45 -0700 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2013-09-09 12:32:45 -0700 |
| commit | 5e1821f21d1aa484f9275d9b0fbbb366d89508b2 (patch) | |
| tree | e5cce303c1497bf4aefead55d2456375eca434e8 /lib | |
| parent | 92f6c3bb10b698c9c1ffb13b7c142a936fb94705 (diff) | |
| parent | 2954db165b92d5bbc463e732a1691c3df9e1e860 (diff) | |
| download | nextcloud-server-5e1821f21d1aa484f9275d9b0fbbb366d89508b2.tar.gz nextcloud-server-5e1821f21d1aa484f9275d9b0fbbb366d89508b2.zip | |
Merge pull request #4772 from owncloud/preview_improvements
oc\preview use avconv instead of ffmpeg
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/preview/movies.php | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/preview/movies.php b/lib/preview/movies.php index e2a1b8edddc..c318137ff0e 100644 --- a/lib/preview/movies.php +++ b/lib/preview/movies.php @@ -9,10 +9,10 @@ namespace OC\Preview; $isShellExecEnabled = !in_array('shell_exec', explode(', ', ini_get('disable_functions'))); -$whichFFMPEG = shell_exec('which ffmpeg'); -$isFFMPEGAvailable = !empty($whichFFMPEG); +$whichAVCONV = shell_exec('which avconv'); +$isAVCONVAvailable = !empty($whichAVCONV); -if($isShellExecEnabled && $isFFMPEGAvailable) { +if($isShellExecEnabled && $isAVCONVAvailable) { class Movie extends Provider { @@ -30,7 +30,7 @@ if($isShellExecEnabled && $isFFMPEGAvailable) { file_put_contents($absPath, $firstmb); //$cmd = 'ffmpeg -y -i ' . escapeshellarg($absPath) . ' -f mjpeg -vframes 1 -ss 1 -s ' . escapeshellarg($maxX) . 'x' . escapeshellarg($maxY) . ' ' . $tmpPath; - $cmd = 'ffmpeg -an -y -i ' . escapeshellarg($absPath) . ' -f mjpeg -vframes 1 -ss 1 ' . escapeshellarg($tmpPath); + $cmd = 'avconv -an -y -ss 1 -i ' . escapeshellarg($absPath) . ' -f mjpeg -vframes 1 ' . escapeshellarg($tmpPath); shell_exec($cmd); |