Merge branch 'master' into tmbinc/FixTimingBugs

[vuplus_dvbapp] / lib / dvb / tstools.h

diff --git a/lib/dvb/tstools.h b/lib/dvb/tstools.h
index f5df8c4..4bc0472 100644 (file)
--- a/lib/dvb/tstools.h
+++ b/lib/dvb/tstools.h
@@ -40,7 +40,7 @@ public:
        int fixupPTS(const off_t &offset, pts_t &pts);
        
                /* get (approximate) offset corresponding to PTS */
-       int getOffset(off_t &offset, pts_t &pts);
+       int getOffset(off_t &offset, pts_t &pts, int marg=0);
        
        int getNextAccessPoint(pts_t &ts, const pts_t &start, int direction);
        
@@ -52,7 +52,7 @@ public:
        int calcBitrate(); /* in bits/sec */
        
        void takeSamples();
-       int eDVBTSTools::takeSample(off_t off, pts_t &p);
+       int takeSample(off_t off, pts_t &p);
        
        int findPMT(int &pmt_pid, int &service_id);
 private: