genuineparts/alltube
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'develop' into feature/stream

Browse source 
Conflicts:
	composer.json
	composer.lock
This commit is contained in:
Pierre Rudloff 2016-04-13 10:33:51 +02:00
commit f7577b9825
5 changed files with 35 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
controllers/FrontController.php
View file

@ -138,7 +138,7 @@ class FrontController
if (parse_url($video->url, PHP_URL_SCHEME) == 'rtmp') {
$builder = new ProcessBuilder(
array(
'/usr/bin/rtmpdump',
$this->config->rtmpdump,
'-q',
'-r',
$video->url,