diff options
| author | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2012-08-18 19:51:58 +0000 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2012-11-20 18:00:14 +0100 |
| commit | 51dac4e0702e361b88e5a373fbb0165f5ad47420 (patch) | |
| tree | 509211589ff67bf2057852194211545d6290afec /stream/stream_file.c | |
| parent | 7759e565b725382d201f6bd0a49982b4d7d39a11 (diff) | |
| download | mpv-51dac4e0702e361b88e5a373fbb0165f5ad47420.tar.bz2 mpv-51dac4e0702e361b88e5a373fbb0165f5ad47420.tar.xz | |
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.
Diffstat (limited to 'stream/stream_file.c')
| -rw-r--r-- | stream/stream_file.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/stream/stream_file.c b/stream/stream_file.c index abf0b37855..fe893af0b4 100644 --- a/stream/stream_file.c +++ b/stream/stream_file.c @@ -105,7 +105,7 @@ static int control(stream_t *s, int cmd, void *arg) { size = lseek(s->fd, 0, SEEK_END); lseek(s->fd, s->pos, SEEK_SET); if(size != (off_t)-1) { - *((off_t*)arg) = size; + *(uint64_t*)arg = size; return 1; } } |