Merge remote-tracking branch 'tuxbox/master'

needs buildfixes


Origin commit data
------------------
Branch: ni/coolstream
Commit: 514cb3ed1e
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-09-23 (Sat, 23 Sep 2017)



------------------
This commit was generated by Migit
This commit is contained in:
Stefan Seyfried
2017-09-23 17:01:42 +02:00
167 changed files with 51814 additions and 2779 deletions

View File

@@ -42,7 +42,6 @@ class cDvbSubtitleBitmaps : public cListObject
{
private:
int64_t pts;
int timeout;
AVSubtitle sub;
public:
cDvbSubtitleBitmaps(int64_t Pts);