git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix small bug introduced with v2 merging
[enigma2.git]
/
lib
/
dvb
/
demux.h
diff --git
a/lib/dvb/demux.h
b/lib/dvb/demux.h
index 3b4cbede06fe9b0ef22d45effc26c1916d6000c0..c7fa5bc0e3727f7d70e25c44a9944ab3fa91e3e8 100644
(file)
--- a/
lib/dvb/demux.h
+++ b/
lib/dvb/demux.h
@@
-4,7
+4,7
@@
#include <lib/dvb/idvb.h>
#include <lib/dvb/isection.h>
#include <lib/dvb/idvb.h>
#include <lib/dvb/isection.h>
-class eDVBDemux: public
virtual
iDVBDemux
+class eDVBDemux: public iDVBDemux
{
int adapter, demux;
friend class eDVBSectionReader;
{
int adapter, demux;
friend class eDVBSectionReader;
@@
-18,7
+18,7
@@
public:
RESULT getMPEGDecoder(ePtr<iTSMPEGDecoder> &reader);
};
RESULT getMPEGDecoder(ePtr<iTSMPEGDecoder> &reader);
};
-class eDVBSectionReader: public
virtual
iDVBSectionReader, public Object
+class eDVBSectionReader: public iDVBSectionReader, public Object
{
DECLARE_REF
private:
{
DECLARE_REF
private: