mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-09-16 01:43:35 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'cst-next'

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: 572de2bbcb
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2016-01-16 (Sat, 16 Jan 2016)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
Stefan Seyfried
2016-01-16 12:51:04 +01:00
parent 137775e41d 82c03e117f
commit 28ab173560
31 changed files with 148 additions and 119 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/gui/movieplayer.cpp
View File

@@ -2202,7 +2202,7 @@ void CMoviePlayerGui::parsePlaylist(CFile *file)
if (strlen(cLine) > 0 && cLine[0]!='#')
{
char *url = NULL;
if ((url = strstr(cLine, "http://")) || (url = strstr(cLine, "rtmp://")) || (url = strstr(cLine, "rtsp://")) || (url = strstr(cLine, "mmsh://")) ) {
if ((url = strstr(cLine, "http://")) || (url = strstr(cLine, "https://")) || (url = strstr(cLine, "rtmp://")) || (url = strstr(cLine, "rtsp://")) || (url = strstr(cLine, "mmsh://")) ) {
if (url != NULL) {
printf("name %s [%d] url: %s\n", name, dur, url);
tmp_file.Name = name;