Skip to content

Commit 0e1ce38

Browse files
Updating php-ffmpeg/php-ffmpeg version, adding font mime type
1 parent cec4bdc commit 0e1ce38

File tree

6 files changed

+15
-11
lines changed

6 files changed

+15
-11
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ try {
107107
}
108108
```
109109

110-
You will find other examples in "/examples" folder.
110+
You will find other examples in "/examples" folder.
111111

112112
Changelog
113113
=========

composer.json

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,11 @@
2929
}
3030
],
3131
"require": {
32-
"php": ">=5.4",
33-
"php-ffmpeg/php-ffmpeg": "0.9.5"
32+
"php": ">=5.4 || ^7.0",
33+
"php-ffmpeg/php-ffmpeg": "^0.15"
34+
},
35+
"require-dev": {
36+
"monolog/monolog": "^2.0"
3437
},
3538
"suggest": {
3639
"php-ffmpeg/extras": "A compilation of common audio & video drivers for PHP-FFMpeg"

examples/draw-texts-and-boxes.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
require_once 'init.php';
1515

1616
// Open source video
17-
$video = $ffmpeg->open(new InputFile('source/Coast - 1270.mp4'));
17+
$video = $ffmpeg->open(new InputFile('source/demo_video_720p_HD.mp4'));
1818

1919
// Apply filter options to video
2020
$video
@@ -81,4 +81,4 @@
8181
print 'Done!';
8282
} catch (ExecutionFailureException $e) {
8383
print $e->getMessage();
84-
}
84+
}

examples/init.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,11 @@
2525
}
2626

2727
$config = [
28-
'ffmpeg.binaries' => 'ffmpeg-20170915-6743351-win64-static/bin/ffmpeg.exe',
29-
'ffprobe.binaries' => 'ffmpeg-20170915-6743351-win64-static/bin/ffprobe.exe',
28+
'ffmpeg.binaries' => './ffmpeg33',
29+
'ffprobe.binaries' => './ffprobe',
3030
'timeout' => 3600, // The timeout for the underlying process
3131
'ffmpeg.threads' => 12, // The number of threads that FFMpeg should use
3232
];
3333

3434
// Init ffmpeg library
35-
$ffmpeg = \Sharapov\FFMpegExtensions\FFMpeg::create($config, $logger);
35+
$ffmpeg = \Sharapov\FFMpegExtensions\FFMpeg::create($config, $logger);

src/php-ffmpeg-extensions/FFMpeg.php

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,8 @@ class FFMpeg {
3636
'image/x-windows-bmp',
3737
'image/jpeg',
3838
'image/pjpeg',
39-
'application/x-font-ttf'
39+
'application/x-font-ttf',
40+
'application/font-sfnt'
4041
];
4142
/** @var FFMpegDriver */
4243
private $_driver;
@@ -254,4 +255,4 @@ private function _cleanupTemporaryFile($filename) {
254255

255256
return $this;
256257
}
257-
}
258+
}

src/php-ffmpeg-extensions/Media/Video.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -174,4 +174,4 @@ public function save(FormatInterface $format, $outputPathFile) {
174174
public function getStreamDuration() {
175175
return $this->getStreams()->videos()->first()->get('duration');
176176
}
177-
}
177+
}

0 commit comments

Comments
 (0)