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. --- stream/stream_lavf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'stream/stream_lavf.c') diff --git a/stream/stream_lavf.c b/stream/stream_lavf.c index d21e35e6a3..9619a06b1a 100644 --- a/stream/stream_lavf.c +++ b/stream/stream_lavf.c @@ -63,7 +63,7 @@ static int control(stream_t *s, int cmd, void *arg) case STREAM_CTRL_GET_SIZE: size = avio_size(avio); if(size >= 0) { - *(off_t *)arg = size; + *(uint64_t *)arg = size; return 1; } break; -- cgit v1.2.3