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

Merge branch 'cst-next' into nmp-cst-next

Browse Source 
- Fix merge conflicts


Origin commit data
------------------
Branch: ni/coolstream
Commit: 7a3c90fccf
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-08-19 (Fri, 19 Aug 2016)



------------------
This commit was generated by Migit
This commit is contained in:
Michael Liebmann
2016-08-19 17:40:48 +02:00
parent 3daad4c6d5 59d3c49084
commit 2c4ccf9555
260 changed files with 8682 additions and 4001 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
lib/libdvbsub/dvbsub.cpp
View File

@@ -115,7 +115,7 @@ printf("[dvb-sub] ***************************************** start, stopped %d pi
pthread_mutex_lock(&readerMutex);
pthread_cond_broadcast(&readerCond);
pthread_mutex_unlock(&readerMutex);
printf("[dvb-sub] started with pid 0x%x\n", pid);
printf("[dvb-sub] started with pid 0x%x\n", dvbsub_pid);
}
return 1;
@@ -280,9 +280,6 @@ static void* reader_thread(void * /*arg*/)
sub_debug.print(Debug::VERBOSE, "%s changed to pid 0x%x\n", __FUNCTION__, dvbsub_pid);
}
len = 0;
count = 0;
len = dmx->Read(tmp, 6, 1000);
if(len <= 0)
continue;