diff options
| author | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2010-06-14 20:11:44 +0000 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-11-02 04:10:10 +0200 |
| commit | 531964aa8d4d6c1c1de8b2dc30f9dd186b82bdea (patch) | |
| tree | 4bf17026486fccd50c3cf3fa411bcc6cc74973c3 /libmpdemux | |
| parent | 82e546da0db147183ef25e2c1e18f295c622e04f (diff) | |
| download | mpv-531964aa8d4d6c1c1de8b2dc30f9dd186b82bdea.tar.bz2 mpv-531964aa8d4d6c1c1de8b2dc30f9dd186b82bdea.tar.xz | |
demux_ty: Cleanup some code, possibly fix vstream support (untested)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31423 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux')
| -rw-r--r-- | libmpdemux/demux_ty.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/libmpdemux/demux_ty.c b/libmpdemux/demux_ty.c index 3e27be5817..6f22a4bbff 100644 --- a/libmpdemux/demux_ty.c +++ b/libmpdemux/demux_ty.c @@ -104,8 +104,6 @@ typedef struct int tmf_totalparts; } TiVoInfo; -off_t vstream_streamsize( ); - // =========================================================================== #define TMF_SIG "showing.xml" @@ -361,16 +359,14 @@ static int demux_ty_fill_buffer( demuxer_t *demux, demux_stream_t *dsds ) // ====================================================================== // If we haven't figured out the size of the stream, let's do so // ====================================================================== -#ifdef STREAMTYPE_STREAM_TY - if ( demux->stream->type == STREAMTYPE_STREAM_TY ) + if ( demux->stream->type == STREAMTYPE_VSTREAM ) { // The vstream code figures out the exact size of the stream demux->movi_start = 0; - demux->movi_end = vstream_streamsize(); - tivo->size = vstream_streamsize(); + demux->movi_end = demux->stream->end_pos; + tivo->size = demux->stream->end_pos; } else -#endif { // If its a local file, try to find the Part Headers, so we can // calculate the ACTUAL stream size |