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:
	controllers/FrontController.php
This commit is contained in:
Pierre Rudloff 2016-04-11 01:22:01 +02:00
commit c29285aaf1
6 changed files with 105 additions and 128 deletions
Download patch file Download diff file Expand all files Collapse all files

2
controllers/FrontController.php
View file

@ -113,7 +113,7 @@ class FrontController
if (isset($params['audio'])) {
try {
try {
return $this->getStream($params["url"], 'bestaudio', $response, $request);
return $this->getStream($params["url"], 'bestaudio[protocol^=http]', $response, $request);
} catch (\Exception $e) {
$video = $this->download->getJSON($params["url"]);