Added a note to cTsToPes about all TS packets having to belong to the same PID

3 files changed, 9 insertions, 1 deletions

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 1d808e65..7ae876a6 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -2131,6 +2131,8 @@ Christoph Haubrich <christoph1.haubrich@arcor.de>
  for changing cBitmap::DrawText() to always draw the background unless ColorBg
  is clrTransparent
  for reporting unused 'synced' member in cTsToPes
+ for suggesting to add a note to cTsToPes about all TS packets having to belong to
+ the same PID
 
 Pekka Mauno <pekka.mauno@iki.fi>
  for fixing cSchedule::GetFollowingEvent() in case there is currently no present
diff --git a/HISTORY b/HISTORY
index fb3e9999..c45a7b19 100644
--- a/HISTORY
+++ b/HISTORY
@@ -6099,3 +6099,5 @@ Video Disk Recorder Revision History
 - EIT events are now only processed if a plausible system time is available, to
   avoid wrong handling of PDC descriptors (thanks to Tobias Bratfisch).
 - Removed unused 'synced' member from cTsToPes (reported by Christoph Haubrich).
+- Added a note to cTsToPes about all TS packets having to belong to the same PID
+  (suggested by Christoph Haubrich).
diff --git a/remux.h b/remux.h
index a1d26a8e..67e29d16 100644
--- a/remux.h
+++ b/remux.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: remux.h 2.12 2009/05/17 09:45:53 kls Exp $
+ * $Id: remux.h 2.13 2009/05/17 09:52:56 kls Exp $
  */
 
 #ifndef __REMUX_H
@@ -248,6 +248,10 @@ public:
        ///< If the given TS packet starts a new PES payload packet, the converter
        ///< will be automatically reset. Any packets before the first one that starts
        ///< a new PES payload packet will be ignored.
+       ///< Once a TS packet has been put into a cTsToPes converter, all subsequent
+       ///< packets until the next call to Reset() must belong to the same PID as
+       ///< the first packet. There is no check whether this actually is the case, so
+       ///< the caller is responsible for making sure this condition is met.
   const uchar *GetPes(int &Length);
        ///< Gets a pointer to the complete PES packet, or NULL if the packet
        ///< is not complete yet. If the packet is complete, Length will contain