Merge remote-tracking branch 'upstream/master'

This commit is contained in:
CaliforniaMountainSnake 2020-02-26 09:43:23 +03:00
commit 580fb21d5a
45 changed files with 240 additions and 185 deletions

View file

@ -94,7 +94,7 @@ class Concat extends AbstractMediaType
$fileStream = @fopen($sourcesFile, 'w');
if($fileStream === false) {
throw new ExecutionFailureException('Cannot open the temporary file.');
throw new RuntimeException('Cannot open the temporary file.');
}
$count_videos = 0;