Mercurial > mplayer.hg
changeset 24506:1639f5402540
get rid of pointless size parameter for tmf_load_chunk
| author | reimar |
|---|---|
| date | Sat, 15 Sep 2007 12:13:45 +0000 |
| parents | f877e1d2bb0f |
| children | e28f9913f48a |
| files | libmpdemux/demux_ty.c |
| diffstat | 1 files changed, 6 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/libmpdemux/demux_ty.c Sat Sep 15 11:56:24 2007 +0000 +++ b/libmpdemux/demux_ty.c Sat Sep 15 12:13:45 2007 +0000 @@ -187,7 +187,7 @@ // =========================================================================== static int tmf_load_chunk( demuxer_t *demux, TiVoInfo *tivo, - unsigned char *buff, int size, int readChunk ) + unsigned char *buff, int readChunk ) { off_t fileoffset; int count; @@ -201,7 +201,7 @@ mp_msg( MSGT_DEMUX, MSGL_ERR, "Read past EOF()\n" ); return 0; } - count = stream_read( demux->stream, buff, size ); + count = stream_read( demux->stream, buff, CHUNKSIZE ); demux->filepos = stream_tell( demux->stream ); mp_msg( MSGT_DEMUX, MSGL_DBG3, "tmf_load_chunk() count %x\n", @@ -391,7 +391,7 @@ mp_msg( MSGT_DEMUX, MSGL_DBG3, "ty:Detected a tmf\n" ); tivo->tmf = 1; ty_tmf_filetoparts( demux, tivo ); - readSize = tmf_load_chunk( demux, tivo, chunk, CHUNKSIZE, 0 ); + readSize = tmf_load_chunk( demux, tivo, chunk, 0 ); } if ( readSize == CHUNKSIZE && AV_RB32(chunk) == TIVO_PES_FILEID ) @@ -420,7 +420,7 @@ { numberParts = tivo->tmf_totalparts; offset = numberParts * TIVO_PART_LENGTH; - readSize = tmf_load_chunk( demux, tivo, chunk, CHUNKSIZE, + readSize = tmf_load_chunk( demux, tivo, chunk, numberParts * ( TIVO_PART_LENGTH - CHUNKSIZE ) / CHUNKSIZE ); } @@ -484,8 +484,7 @@ } else { - readSize = tmf_load_chunk( demux, tivo, chunk, CHUNKSIZE, - tivo->whichChunk ); + readSize = tmf_load_chunk( demux, tivo, chunk, tivo->whichChunk ); if ( readSize != CHUNKSIZE ) return 0; tivo->whichChunk++; @@ -502,8 +501,7 @@ } else { - readSize = tmf_load_chunk( demux, tivo, chunk, CHUNKSIZE, - tivo->whichChunk ); + readSize = tmf_load_chunk( demux, tivo, chunk, tivo->whichChunk ); tivo->whichChunk++; }