Skip to content

Commit 6abfeaa

Browse files
committed
Merge branch 'master' of github.com:Ziggeo/php-ffmpeg-toolkit into task-php7-upgrade
2 parents 94811e4 + 4930eb2 commit 6abfeaa

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

FfmpegVideoTranscoding.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ public static function transcode($source, $options) {
143143
if (@$options["width"] && @$options["height"])
144144
$video->addFilter(new RotationResizeFilter($rotation, new FFMpeg\Coordinate\Dimension($options["width"], $options["height"]), @$options["resizefit"] ? $options["resizefit"] : "inset"));
145145
$video->filters()->framerate(new FFMpeg\Coordinate\FrameRate(25), 250);
146-
if (!@$options["noaudio"])
146+
if (!@$options["noaudio"] && !@$options["nosync"])
147147
$video->filters()->synchronize();
148148
if (@$options["filters"])
149149
foreach ($options["filters"] as $filter)

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name" : "ziggeo/php-ffmpeg-toolkit",
33
"description" : "A php library for running ffmpeg.",
4-
"version" : "0.0.14",
4+
"version" : "0.0.15",
55
"license" : "Apache-2.0",
66
"require" : {
77
"php" : ">=7.1.0",

0 commit comments

Comments
 (0)