mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-26 15:02:56 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dvbsi++' of c00lstreamtech.de:cst-private-neutrino into includecleanup

Browse Source 
Conflicts:
	src/eitd/SIlanguage.cpp
	src/eitd/SIsections.cpp
	src/eitd/dmx.cpp
	src/eitd/dmxapi.cpp
This commit is contained in:
[CST] Bas
2012-03-08 12:17:03 +08:00
parent 96e7c51cff a41d93a686
commit ce9eb10ed0
46 changed files with 526 additions and 853 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
lib/libdvbsub/dvbsub.cpp
View File

@@ -360,7 +360,6 @@ static void* dvbsub_thread(void* /*arg*/)
gettimeofday(&now, NULL);
int ret = 0;
now.tv_usec += (timeout == 0) ? 1000000 : timeout; // add the timeout
while (now.tv_usec >= 1000000) { // take care of an overflow
now.tv_sec++;
@@ -370,7 +369,7 @@ static void* dvbsub_thread(void* /*arg*/)
restartWait.tv_nsec = now.tv_usec * 1000; // nano seconds
pthread_mutex_lock( &packetMutex );
ret = pthread_cond_timedwait( &packetCond, &packetMutex, &restartWait );
pthread_cond_timedwait( &packetCond, &packetMutex, &restartWait );
pthread_mutex_unlock( &packetMutex );
timeout = dvbSubtitleConverter->Action();