[MPlayer-cvslog] r24505 - trunk/libmpdemux/demux_ty.c

[reimar]

Author: reimar
Date: Fri Sep 14 22:48:04 2007
New Revision: 24505

Log:
Minor simplifications


Modified:
   trunk/libmpdemux/demux_ty.c

Modified: trunk/libmpdemux/demux_ty.c
==============================================================================
--- trunk/libmpdemux/demux_ty.c	(original)
+++ trunk/libmpdemux/demux_ty.c	Fri Sep 14 22:48:04 2007
@@ -203,9 +203,9 @@ static int ty_tmf_filetoparts( demuxer_t
          parts++;
       }
 
-      if (offset + skip >= totalsize)
-         break;
       offset += skip;
+      if (offset >= totalsize)
+         break;
    }
    tivo->tmf_totalparts = parts;
    mp_msg( MSGT_DEMUX, MSGL_DBG3,
@@ -745,10 +745,10 @@ static int demux_ty_fill_buffer( demuxer
                      }
 
                      // Collapse the Audio Buffer
+                     tivo->lastAudioEnd -= esOffset2;
                      memmove( &tivo->lastAudio[ 0 ], 
                         &tivo->lastAudio[ esOffset2 ], 
-                        tivo->lastAudioEnd - esOffset2 );
-                     tivo->lastAudioEnd -= esOffset2;
+                        tivo->lastAudioEnd );
                   }
                }
             }