From 3fb918a7e237b587f0eb2930a8cb9c1b17394e35 Mon Sep 17 00:00:00 2001 From: guimeira Date: Fri, 27 Sep 2013 01:30:11 -0300 Subject: [PATCH] Parameter on ClipFilter made optional --- src/FFMpeg/Filters/Video/ClipFilter.php | 11 +++++++++-- src/FFMpeg/Filters/Video/VideoFilters.php | 2 +- 2 files changed, 10 insertions(+), 3 deletions(-) mode change 100644 => 100755 src/FFMpeg/Filters/Video/ClipFilter.php mode change 100644 => 100755 src/FFMpeg/Filters/Video/VideoFilters.php diff --git a/src/FFMpeg/Filters/Video/ClipFilter.php b/src/FFMpeg/Filters/Video/ClipFilter.php old mode 100644 new mode 100755 index ecb2671..9cb3921 --- a/src/FFMpeg/Filters/Video/ClipFilter.php +++ b/src/FFMpeg/Filters/Video/ClipFilter.php @@ -24,7 +24,7 @@ class ClipFilter implements VideoFilterInterface /** @var integer */ private $priority; - public function __construct(TimeCode $start, TimeCode $duration, $priority = 0) + public function __construct(TimeCode $start, TimeCode $duration = null, $priority = 0) { $this->start = $start; $this->duration = $duration; @@ -60,6 +60,13 @@ class ClipFilter implements VideoFilterInterface */ public function apply(Video $video, VideoInterface $format) { - return array('-ss', $this->start->__toString(), '-t', $this->duration->__toString()); + $commands = array('-ss', (string) $this->start); + + if($this->duration !== null) { + $commands[] = '-t'; + $commands[] = (string) $this->duration; + } + + return $commands; } } diff --git a/src/FFMpeg/Filters/Video/VideoFilters.php b/src/FFMpeg/Filters/Video/VideoFilters.php old mode 100644 new mode 100755 index 5a9fd6b..d502d26 --- a/src/FFMpeg/Filters/Video/VideoFilters.php +++ b/src/FFMpeg/Filters/Video/VideoFilters.php @@ -75,7 +75,7 @@ class VideoFilters extends AudioFilters * * @return VideoFilters */ - public function clip($start, $duration) + public function clip($start, $duration = null) { $this->media->addFilter(new ClipFilter($start, $duration));