Merge branch 'check/next-cc'

Only compile-tested.


Origin commit data
------------------
Commit: 548448456a
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-11-13 (Wed, 13 Nov 2013)
This commit is contained in:
Stefan Seyfried
2013-11-13 14:04:15 +01:00
56 changed files with 1278 additions and 203 deletions

View File

@@ -782,7 +782,7 @@ long delta_time_ms (struct timeval *tv, struct timeval *last_tv)
return timeval_to_ms (tv) - timeval_to_ms (last_tv);
}
static cDemux * dmx;
static cDemux * dmx = NULL;
int CStreamInfo2::ts_setup ()
{