summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorreimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>2007-09-15 11:41:47 +0000
committerreimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>2007-09-15 11:41:47 +0000
commit6bfcbe1e8130791705d8dfd3abe7779843ad98d6 (patch)
tree82cdcf53a2c64b844e96d0ff681408e6dec13c83
parent7c8fcecc131a4b5dceaa79f3a9e9b1abb87f013b (diff)
downloadmpv-6bfcbe1e8130791705d8dfd3abe7779843ad98d6.tar.bz2
mpv-6bfcbe1e8130791705d8dfd3abe7779843ad98d6.tar.xz
Simplify another two ifs into one
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24523 b3059339-0415-0410-9bf9-f77b7e298cf2
-rw-r--r--libmpdemux/demux_ty.c8
1 files changed, 1 insertions, 7 deletions
diff --git a/libmpdemux/demux_ty.c b/libmpdemux/demux_ty.c
index 9692a27a2d..f4d75b3e24 100644
--- a/libmpdemux/demux_ty.c
+++ b/libmpdemux/demux_ty.c
@@ -197,13 +197,7 @@ static int tmf_load_chunk( demuxer_t *demux, TiVoInfo *tivo,
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;
}