Skip to content

Commit 151c609

Browse files
committed
Merge branch 'release/1.2.8' into v1
2 parents 3642cf7 + 7654b70 commit 151c609

File tree

3 files changed

+6
-2
lines changed

3 files changed

+6
-2
lines changed

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
# Transcoder Changelog
22

3+
## 1.2.8 - 2019.11.12
4+
### Changed
5+
* Fixed more issues with the `synchronous` option
6+
37
## 1.2.7 - 2019.11.12
48
### Changed
59
* Fixed issues with the `synchronous` and `stripMetadata` options

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "nystudio107/craft-transcoder",
33
"description": "Transcode video & audio files to various formats, and provide video thumbnails",
44
"type": "craft-plugin",
5-
"version": "1.2.7",
5+
"version": "1.2.8",
66
"keywords": [
77
"craft",
88
"cms",

src/services/Transcode.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -425,7 +425,7 @@ public function getAudioUrl($filePath, $audioOptions): string
425425
$result = Craft::getAlias($url).$destAudioFile;
426426
} else {
427427
// Kick off the transcoding
428-
$this->executeShellCommand($ffmpegCmd);
428+
$pid = $this->executeShellCommand($ffmpegCmd);
429429

430430
if ($synchronous) {
431431
Craft::info($ffmpegCmd, __METHOD__);

0 commit comments

Comments
 (0)