james/fembooru
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Set ffmpeg's "overwrite output files" switch (-y)

Browse Source 
Regenerate thumbnail doesn't work since the output file already exists and ffmpeg expects the user to decide wether to replace the file or not. With the -y switch set, ffmpeg does so without asking.

https://ffmpeg.org/ffmpeg.html#Main-options
This commit is contained in:
HungryFeline 2016-06-16 16:40:51 +02:00 committed by GitHub
parent 3d05c2896a
commit 94ba42fc70
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ext/handle_video/main.php
View File

@ -85,12 +85,12 @@ class VideoFileHandler extends DataHandlerExtension {
if ($config->get_bool("video_thumb_ignore_aspect_ratio") == true) if ($config->get_bool("video_thumb_ignore_aspect_ratio") == true)
{ {
$cmd = escapeshellcmd("{$ffmpeg} -i {$inname} -ss 00:00:00.0 -f image2 -vframes 1 {$outname}"); $cmd = escapeshellcmd("{$ffmpeg} -y -i {$inname} -ss 00:00:00.0 -f image2 -vframes 1 {$outname}");
} }
else else
{ {
$scale = 'scale="' . escapeshellarg("if(gt(a,{$w}/{$h}),{$w},-1)") . ':' . escapeshellarg("if(gt(a,{$w}/{$h}),-1,{$h})") . '"'; $scale = 'scale="' . escapeshellarg("if(gt(a,{$w}/{$h}),{$w},-1)") . ':' . escapeshellarg("if(gt(a,{$w}/{$h}),-1,{$h})") . '"';
$cmd = "{$ffmpeg} -i {$inname} -vf {$scale} -ss 00:00:00.0 -f image2 -vframes 1 {$outname}"; $cmd = "{$ffmpeg} -y -i {$inname} -vf {$scale} -ss 00:00:00.0 -f image2 -vframes 1 {$outname}";
} }
exec($cmd, $output, $returnValue); exec($cmd, $output, $returnValue);