diff options
| author | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2007-09-14 17:03:26 +0000 |
|---|---|---|
| committer | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2007-09-14 17:03:26 +0000 |
| commit | 5789ab4ab7a48978885751ab0a3e00c984448fb0 (patch) | |
| tree | 6aae2b2d5eb31c61309721f6c157cd8a1b68f317 /libmpdemux/demux_ty.c | |
| parent | 56f5ab430f5236cd4f533065b6d214f322898e77 (diff) | |
| download | mpv-5789ab4ab7a48978885751ab0a3e00c984448fb0.tar.bz2 mpv-5789ab4ab7a48978885751ab0a3e00c984448fb0.tar.xz | |
More simplifications
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24477 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux/demux_ty.c')
| -rw-r--r-- | libmpdemux/demux_ty.c | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/libmpdemux/demux_ty.c b/libmpdemux/demux_ty.c index 450fa237f4..97a0207855 100644 --- a/libmpdemux/demux_ty.c +++ b/libmpdemux/demux_ty.c @@ -137,14 +137,12 @@ static int ty_tmf_filetoparts( demuxer_t *demux, TiVoInfo *tivo ) char *name; char *sizestr; int size; - int count; off_t offset; off_t totalsize; off_t skip; int parts = 0; int isty; int index; - int ok; offset = 0; totalsize = demux->stream->end_pos; @@ -152,16 +150,12 @@ static int ty_tmf_filetoparts( demuxer_t *demux, TiVoInfo *tivo ) mp_msg( MSGT_DEMUX, MSGL_DBG3, "Dumping tar contents\n" ); while (1) { - ok = stream_seek( demux->stream, offset ); - if ( offset + 512 == totalsize ) - break; - if ( ok == 0 ) + if (!stream_seek(demux->stream, offset)) { mp_msg( MSGT_DEMUX, MSGL_DBG3, "Seek bad %"PRId64"\n", (int64_t)offset ); break; } - count = stream_read( demux->stream, header, 512 ); - if ( count < 512 ) + if (stream_read(demux->stream, header, 512) < 512) { mp_msg( MSGT_DEMUX, MSGL_DBG3, "Read bad\n" ); break; @@ -176,9 +170,7 @@ static int ty_tmf_filetoparts( demuxer_t *demux, TiVoInfo *tivo ) skip = 512 + ((size + 511) & ~511); if ( offset + skip > totalsize ) - { size = totalsize - offset; - } isty = ty_extensionis( name, ".ty" ); @@ -218,10 +210,9 @@ static int ty_tmf_filetoparts( demuxer_t *demux, TiVoInfo *tivo ) parts++; } - if ( ( offset + skip ) > totalsize ) + if (offset + skip >= totalsize) break; - else - offset += skip; + offset += skip; } tivo->tmf_totalparts = parts; mp_msg( MSGT_DEMUX, MSGL_DBG3, |