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 /demux | |
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 'demux')
-rw-r--r-- | demux/demux_lavf.c | 2 |
1 files changed, 1 insertions, 1 deletions
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; |