Conflicts:
	generic-pc/dmx.cpp


Origin commit data
------------------
Branch: master
Commit: f764d6d5e0
Author: vanhofen <vanhofen@gmx.de>
Date: 2018-10-02 (Tue, 02 Oct 2018)



------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2018-10-02 21:58:14 +02:00
57 changed files with 1208 additions and 671 deletions

View File

@@ -20,10 +20,12 @@ class cPlayback
bool enabled;
bool playing, first;
bool no_probe;
bool got_vpts_ts;
int nPlaybackSpeed;
int mAudioStream;
int mSubtitleStream;
int mTeletextStream;
int64_t vpts_ts;
bool Stop(void);
bool decoders_closed;
playmode_t pm;