dan/ffmpeg-mappable-media
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'upstream/master'

Browse source
This commit is contained in:
Lasse Lehtinen 2018-05-30 15:02:09 +03:00
commit 4f40ba9d96
5 changed files with 57 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/FFMpeg/Media/Concat.php
View file

@ -72,7 +72,7 @@ class Concat extends AbstractMediaType
/**
* Saves the concatenated video in the given array, considering that the sources videos are all encoded with the same codec.
*
* @param array $outputPathfile
* @param string $outputPathfile
* @param string $streamCopy
*
* @return Concat
@ -144,6 +144,7 @@ class Concat extends AbstractMediaType
$this->driver->command($commands);
} catch (ExecutionFailureException $e) {
$this->cleanupTemporaryFile($outputPathfile);
// TODO@v1: paste this line into an `finally` block.
$this->cleanupTemporaryFile($sourcesFile);
throw new RuntimeException('Unable to save concatenated video', $e->getCode(), $e);
}

4
src/FFMpeg/Media/Frame.php
View file

@ -115,7 +115,9 @@ class Frame extends AbstractMediaType
$commands = array_merge($commands, $filter->apply($this));
}
$commands = array_merge($commands, array($pathfile));
if (!$returnBase64) {
$commands = array_merge($commands, array($pathfile));
}
try {
if(!$returnBase64) {