dan/ffmpeg-mappable-media
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into patch-1

Browse source
This commit is contained in:
Jens Hausdorf 2017-06-28 05:59:32 +02:00 • committed by GitHub
commit 292ec162e4
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/FFMpeg/Filters/Video/VideoFilters.php
View file

@ -46,7 +46,7 @@ class VideoFilters extends AudioFilters
* Changes the video framerate. * Changes the video framerate.
* *
* @param FrameRate $framerate * @param FrameRate $framerate
* @param type $gop * @param Integer $gop
* *
* @return VideoFilters * @return VideoFilters
*/ */

2
src/FFMpeg/Media/Video.php
View file

@ -258,7 +258,7 @@ class Video extends Audio
/** /**
* Concatenates a list of videos into one unique video. * Concatenates a list of videos into one unique video.
* *
* @param string $sources * @param array $sources
* @return Concat * @return Concat
*/ */
public function concat($sources) public function concat($sources)