Snapshot 2009-07-06

remux/ts2pes.h

@@ -4,7 +4,7 @@
  * This file is based on a copy of remux.h from Klaus Schmidinger's
  * VDR, version 1.6.0.
  *
- * $Id: ts2pes.h,v 1.3 2009/06/30 06:04:33 schmirl Exp $
+ * $Id: ts2pes.h,v 1.4 2009/07/06 06:11:11 schmirl Exp $
  */
 
 #ifndef VDR_STREAMDEV_TS2PES_H
@@ -34,7 +34,7 @@ public:
        ///< APids, DPids and SPids are pointers to zero terminated lists of audio,
        ///< dolby and subtitle PIDs (the pointers may be NULL if there is no such
        ///< PID).
-  ~cTS2PESRemux();
+  virtual ~cTS2PESRemux();
   int Put(const uchar *Data, int Count);
        ///< Puts at most Count bytes of Data into the remuxer.
        ///< \return Returns the number of bytes actually consumed from Data.

remux/ts2ps.h

@@ -1,5 +1,5 @@
-#ifndef VDR_STREAMDEV_TS2PESREMUX_H
-#define VDR_STREAMDEV_TS2PESREMUX_H
+#ifndef VDR_STREAMDEV_TS2PSREMUX_H
+#define VDR_STREAMDEV_TS2PSREMUX_H
 
 #include "remux/tsremux.h"
 #include "server/streamer.h"
@@ -33,4 +33,4 @@ public:
 
 } // namespace Streamdev
 
-#endif // VDR_STREAMDEV_TS2PESREMUX_H
+#endif // VDR_STREAMDEV_TS2PSREMUX_H

remux/tsremux.h

@@ -6,9 +6,6 @@
 
 // Picture types:
 #define NO_PICTURE 0
-#define I_FRAME    1
-#define P_FRAME    2
-#define B_FRAME    3
 
 namespace Streamdev {