--- multiplexer/splitpes.c	2001/03/19 20:52:34	1.1
+++ multiplexer/splitpes.c	2001/03/29 13:27:43	1.2
@@ -85,7 +85,7 @@ int pes_stream_id (refr_data *d)
 int pes_packet_length (refr_data *d)
 { /* special case len = 0: to do 2.4.3.7 */
 #define MAX_PACKETSIZE_PROCESSABLE \
-    (mmin((MAX_DATA_RAWB-HIGHWATER_IN),(MAX_DATA_INB/2)) - PES_HEADER_SIZE)
+    (mmin((MAX_DATA_RAWB-HIGHWATER_RAW),(MAX_DATA_INB/2)) - PES_HEADER_SIZE)
   int i, l;
   i = d->out;
   list_incr (i,*d,PES_PACKET_LENGTH);
@@ -143,7 +143,7 @@ boolean split_pes (file_descr *f)
               return (FALSE);
             }
           } else {
-            if (list_free (f->data) < HIGHWATER_IN) {
+            if (list_free (f->data) < HIGHWATER_RAW) {
               if (!S_ISREG(f->stat.st_mode)) {
                 f->skipped += PES_SYNC_SIZE;
                 f->total += PES_SYNC_SIZE;
@@ -169,11 +169,11 @@ boolean split_pes (file_descr *f)
                 warn (LDEB,"Sequence",EPES,0,1,f->sequence);
                 c->sequence = f->sequence++;
                 c->scramble = 0;
-                c->time.read = msec_now ();
+                c->msecread = msec_now ();
                 if (S_ISREG (f->stat.st_mode)) {
-                  c->time.push = c->time.read; /* wrong, but how ? */
+                  c->msecpush = c->msecread; /* wrong, but how ? */
                 } else {
-                  c->time.push = c->time.read; /* enough ? */
+                  c->msecpush = c->msecread; /* enough ? */
                 }
                 c->pcr.valid = FALSE;
                 c->opcr.valid = FALSE;