# HG changeset patch
# User reimar
# Date 1189802884 0
# Node ID cb919d4b54e8d2923807f294bec69d217da8bcf8
# Parent  cf224658fbe28928d5a024344f25e688157389bb
Minor simplifications

diff -r cf224658fbe2 -r cb919d4b54e8 libmpdemux/demux_ty.c
--- a/libmpdemux/demux_ty.c	Fri Sep 14 20:41:32 2007 +0000
+++ b/libmpdemux/demux_ty.c	Fri Sep 14 20:48:04 2007 +0000
@@ -203,9 +203,9 @@
          parts++;
       }
 
-      if (offset + skip >= totalsize)
+      offset += skip;
+      if (offset >= totalsize)
          break;
-      offset += skip;
    }
    tivo->tmf_totalparts = parts;
    mp_msg( MSGT_DEMUX, MSGL_DBG3,
@@ -745,10 +745,10 @@
                      }
 
                      // Collapse the Audio Buffer
+                     tivo->lastAudioEnd -= esOffset2;
                      memmove( &tivo->lastAudio[ 0 ], 
                         &tivo->lastAudio[ esOffset2 ], 
-                        tivo->lastAudioEnd - esOffset2 );
-                     tivo->lastAudioEnd -= esOffset2;
+                        tivo->lastAudioEnd );
                   }
                }
             }