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

[reimar]

Author: reimar
Date: Sat Sep 15 13:41:47 2007
New Revision: 24523

Log:
Simplify another two ifs into one


Modified:
   trunk/libmpdemux/demux_ty.c

Modified: trunk/libmpdemux/demux_ty.c
==============================================================================
--- trunk/libmpdemux/demux_ty.c	(original)
+++ trunk/libmpdemux/demux_ty.c	Sat Sep 15 13:41:47 2007
@@ -197,13 +197,7 @@ static int tmf_load_chunk( demuxer_t *de
 
    fileoffset = tmf_filetooffset(tivo, readChunk);
 
-   if (fileoffset == -1) {
-      mp_msg(MSGT_DEMUX, MSGL_ERR, "Read past EOF()\n");
-      return 0;
-   }
-
-   if ( stream_seek( demux->stream, fileoffset ) != 1 )
-   {
+   if (fileoffset == -1 || !stream_seek(demux->stream, fileoffset)) {
       mp_msg( MSGT_DEMUX, MSGL_ERR, "Read past EOF()\n" );
       return 0;
    }