Merge branch 'master' into master

This commit is contained in:
Jens Hausdorf 2018-10-03 21:57:24 +02:00 committed by GitHub
commit b76c37010a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -105,7 +105,7 @@ class Concat extends AbstractMediaType
if($count_videos != 0)
$line .= "\n";
$line .= "file ".$videoPath;
$line .= "file " . addcslashes($videoPath, '\'"\\\0 ');
fwrite($fileStream, $line);