Merge pull request #54683 from nextcloud/chore/preview/remove-avconv-support

Author: provokateurin

config/config.sample.php

@@ -1429,7 +1429,7 @@
 /**
  * Custom path for ffmpeg binary
  *
- * Defaults to ``null`` and falls back to searching ``avconv`` and ``ffmpeg``
+ * Defaults to ``null`` and falls back to searching ``ffmpeg``
  * in the configured ``PATH`` environment
  */
 'preview_ffmpeg_path' => '/usr/bin/ffmpeg',

lib/private/Preview/Movie.php

@@ -135,12 +135,7 @@ private function generateThumbNail(int $maxX, int $maxY, string $absPath, int $s
 
 		$binaryType = substr(strrchr($this->binary, '/'), 1);
 
-		if ($binaryType === 'avconv') {
-			$cmd = [$this->binary, '-y', '-ss', (string)$second,
-				'-i', $absPath,
-				'-an', '-f', 'mjpeg', '-vframes', '1', '-vsync', '1',
-				$tmpPath];
-		} elseif ($binaryType === 'ffmpeg') {
+		if ($binaryType === 'ffmpeg') {
 			if ($this->useHdr($absPath)) {
 				// Force colorspace to '2020_ncl' because some videos are
 				// tagged incorrectly as 'reserved' resulting in fail if not forced.

lib/private/PreviewManager.php

@@ -373,14 +373,11 @@ protected function registerCoreProviders() {
 
 		$this->registerCoreProvidersOffice();
 
-		// Video requires avconv or ffmpeg
+		// Video requires ffmpeg
 		if (in_array(Preview\Movie::class, $this->getEnabledDefaultProvider())) {
 			$movieBinary = $this->config->getSystemValue('preview_ffmpeg_path', null);
 			if (!is_string($movieBinary)) {
-				$movieBinary = $this->binaryFinder->findBinaryPath('avconv');
-				if (!is_string($movieBinary)) {
-					$movieBinary = $this->binaryFinder->findBinaryPath('ffmpeg');
-				}
+				$movieBinary = $this->binaryFinder->findBinaryPath('ffmpeg');
 			}
 
 

tests/lib/Preview/MovieTest.php

@@ -26,10 +26,7 @@ class MovieTest extends Provider {
 
 	protected function setUp(): void {
 		$binaryFinder = Server::get(IBinaryFinder::class);
-		$movieBinary = $binaryFinder->findBinaryPath('avconv');
-		if (!is_string($movieBinary)) {
-			$movieBinary = $binaryFinder->findBinaryPath('ffmpeg');
-		}
+		$movieBinary = $binaryFinder->findBinaryPath('ffmpeg');
 
 		if (is_string($movieBinary)) {
 			parent::setUp();