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

Merge branch 'master' into jens1o-patch-1

Browse source
This commit is contained in:
Jens Hausdorf 2018-05-28 09:14:13 +02:00 • committed by GitHub
commit da15debf75
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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) {

4
tests/Unit/Media/FrameTest.php
View file

@ -61,7 +61,9 @@ class FrameTest extends AbstractMediaTestCase
$pathfile = '/target/destination';
array_push($commands, $pathfile);
if (!$base64) {
array_push($commands, $pathfile);
}
$driver->expects($this->once())
->method('command')