# HG changeset patch
# User reimar
# Date 1189788292 0
# Node ID f71e3d4c2816948339c9a6e639c83c3ad05730b4
# Parent  abcfa91fcc9afaf4d4fb1683a6596409c46d95d1
Simplify EOF handling

diff -r abcfa91fcc9a -r f71e3d4c2816 libmpdemux/demux_ty.c
--- a/libmpdemux/demux_ty.c	Fri Sep 14 16:42:46 2007 +0000
+++ b/libmpdemux/demux_ty.c	Fri Sep 14 16:44:52 2007 +0000
@@ -282,19 +282,13 @@
    mp_msg( MSGT_DEMUX, MSGL_DBG3, "\ntmf_load_chunk() begin %d\n", 
       readChunk );
 
-   if ( tivo->tmf_totalparts <= 0 )
-   {
-      return( 0 );
-   }
+   fileoffset = tmf_filetooffset(tivo, readChunk);
 
-   if ( readChunk >= tivo->tmf_totalchunks )
-   {
-      mp_msg( MSGT_DEMUX, MSGL_ERR, "Read past EOF()\n" );
-      return( 0 );
+   if (fileoffset == -1) {
+      mp_msg(MSGT_DEMUX, MSGL_ERR, "Read past EOF()\n");
+      return 0;
    }
 
-   fileoffset = tmf_filetooffset(tivo, readChunk);
-
    if ( stream_seek( demux->stream, fileoffset ) != 1 )
    {
       mp_msg( MSGT_DEMUX, MSGL_ERR, "Read past EOF()\n" );