mirror of
https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git
synced 2025-08-27 15:32:52 +02:00
Merge remote-tracking branch 'tuxbox/master'
* needs compile fixes
* needs additional tests, of course :-)
Origin commit data
------------------
Commit: 13ab1ebc8a
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2016-10-22 (Sat, 22 Oct 2016)
This commit is contained in:
@@ -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;
|
||||
|
Reference in New Issue
Block a user