|
|
diff -pruN mpgtx-1.3/mpeg.cxx mpgtx-1.3_new/mpeg.cxx
--- mpgtx-1.3/mpeg.cxx 2002-08-30 18:03:12.000000000 +0200
+++ mpgtx-1.3_new/mpeg.cxx 2005-01-12 17:01:47.085003784 +0100
@@ -1537,7 +1537,7 @@ void mpeg::SecsToHMS(char* HMS, float du
// find next 0x 00 00 01 xx sequence, returns offset or -1 on err #ifndef _WIN32 #ifndef _MACOSX -inline
+//inline
#endif #endif @@ -1568,7 +1568,7 @@ off_t mpeg::FindNextMarker(off_t from){
// change mark to xx #ifndef _WIN32 #ifndef _MACOSX -inline
+//inline
#endif #endif @@ -1596,7 +1596,7 @@ off_t mpeg::FindNextMarker(off_t from, m
// find next 0X00 00 01 mark #ifndef _WIN32 #ifndef _MACOSX -inline
+//inline
#endif #endif @@ -1631,7 +1631,7 @@ off_t mpeg::FindNextMarker(off_t from, m
// same as above but optimized for backward search #ifndef _WIN32 #ifndef _MACOSX -inline
+//inline
#endif #endif @@ -1656,7 +1656,7 @@ off_t mpeg::bdFindNextMarker(off_t from,
#ifndef _WIN32 #ifndef _MACOSX -inline
+//inline
#endif #endif @@ -2619,7 +2619,7 @@ transport::transport()
PMT_PIDs(0), n_PMT_PIDs(0), read_pmts(0) -{};
+{}
transport::~transport() { BTRACK; @@ -2791,4 +2791,4 @@ while (p != -1)
} -}
\ No newline at end of file +}
diff -pruN mpgtx-1.3/mpeg.hh mpgtx-1.3_new/mpeg.hh
--- mpgtx-1.3/mpeg.hh 2002-08-30 18:03:12.000000000 +0200
+++ mpgtx-1.3_new/mpeg.hh 2005-01-12 16:59:17.195790408 +0100
@@ -113,6 +113,7 @@ class transport
class mpeg { friend class mpegSystemOut; + friend class mpegVideoOut;
friend class demuxer; protected: // disallow basic constructors diff -pruN mpgtx-1.3/mpegOut.cxx mpgtx-1.3_new/mpegOut.cxx
--- mpgtx-1.3/mpegOut.cxx 2002-08-30 18:03:12.000000000 +0200
+++ mpgtx-1.3_new/mpegOut.cxx 2005-01-12 17:00:10.654663424 +0100
@@ -7,6 +7,7 @@
************************************************************/ +#include "mpeg.hh"
#include "mpegOut.hh" #include "common.hh" #include <stdio.h>
|