Merge branch 'master' into pu/mp

This commit is contained in:
Jacek Jendrzej
2017-09-14 13:54:04 +02:00
61 changed files with 50439 additions and 713 deletions

View File

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