Merge branch 'master' into patch-1

2017-06-28 05:59:32 +02:00 · 2017-06-28 05:59:32 +02:00 · 292ec162e4
commit 292ec162e4
parent 928a908d16 cedcd37bd2
2 changed files with 2 additions and 2 deletions
--- a/src/FFMpeg/Filters/Video/VideoFilters.php
+++ b/src/FFMpeg/Filters/Video/VideoFilters.php
@ -46,7 +46,7 @@ class VideoFilters extends AudioFilters
     * Changes the video framerate.
     *
     * @param FrameRate $framerate
-     * @param type      $gop
+     * @param Integer      $gop
     *
     * @return VideoFilters
     */
--- a/src/FFMpeg/Media/Video.php
+++ b/src/FFMpeg/Media/Video.php
@ -258,7 +258,7 @@ class Video extends Audio
    /**
     * Concatenates a list of videos into one unique video.
     *
-     * @param  string $sources
+     * @param  array $sources
     * @return Concat
     */
    public function concat($sources)