From 51dac4e0702e361b88e5a373fbb0165f5ad47420 Mon Sep 17 00:00:00 2001 From: reimar Date: Sat, 18 Aug 2012 19:51:58 +0000 Subject: stream: change STREAM_CTRL_GET_SIZE argument type to uint64_t Update endpos each time libavformat asks for it. Fixes playback of still downloading files to not stop before we really reached the end. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@35107 b3059339-0415-0410-9bf9-f77b7e298cf2 Conflicts: libmpdemux/demux_lavf.c Change STREAM_CTRL_GET_SIZE argument type from off_t to uint64_t. Also fix the incorrect type of the uint64_res variable. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@35360 b3059339-0415-0410-9bf9-f77b7e298cf2 Conflicts: libmpdemux/demux_lavf.c libmpdemux/muxer_lavf.c Note: also merges the "forgotten" cache support from r35107. --- demux/demux_lavf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'demux') diff --git a/demux/demux_lavf.c b/demux/demux_lavf.c index 769cf02101..dd8af7cb47 100644 --- a/demux/demux_lavf.c +++ b/demux/demux_lavf.c @@ -112,7 +112,7 @@ static int64_t mp_seek(void *opaque, int64_t pos, int whence) else if (whence == SEEK_SET) pos += stream->start_pos; else if (whence == AVSEEK_SIZE && stream->end_pos > 0) { - off_t size; + uint64_t size; if (stream_control(stream, STREAM_CTRL_GET_SIZE, &size) == STREAM_OK) return size; return stream->end_pos - stream->start_pos; -- cgit v1.2.3