diff options
| author | wm4 <wm4@nowhere> | 2015-08-18 00:10:54 +0200 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2015-08-18 00:10:54 +0200 |
| commit | cf2fa9d3e5bd6b8ca3e1637080b665e896ea60a0 (patch) | |
| tree | 1de6ea60ee9f38ad5b7b66d7d15ee7a806a1520b /demux/demux.c | |
| parent | bf5eac8dd3f142acd0d506407f1ae853ada3c5bc (diff) | |
| download | mpv-cf2fa9d3e5bd6b8ca3e1637080b665e896ea60a0.tar.bz2 mpv-cf2fa9d3e5bd6b8ca3e1637080b665e896ea60a0.tar.xz | |
stream: provide a stream_get_size() convenience function
And use it everywhere, instead of retrieving the size manually. Slight
simplification.
Diffstat (limited to 'demux/demux.c')
| -rw-r--r-- | demux/demux.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/demux/demux.c b/demux/demux.c index 7d66c56745..d0e44ab363 100644 --- a/demux/demux.c +++ b/demux/demux.c @@ -1300,7 +1300,6 @@ static void update_cache(struct demux_internal *in) // Don't lock while querying the stream. double time_length = -1; struct mp_tags *stream_metadata = NULL; - int64_t stream_size = -1; int64_t stream_cache_size = -1; int64_t stream_cache_fill = -1; int stream_cache_idle = -1; @@ -1310,8 +1309,8 @@ static void update_cache(struct demux_internal *in) &time_length); } + int64_t stream_size = stream_get_size(stream); stream_control(stream, STREAM_CTRL_GET_METADATA, &stream_metadata); - stream_control(stream, STREAM_CTRL_GET_SIZE, &stream_size); stream_control(stream, STREAM_CTRL_GET_CACHE_SIZE, &stream_cache_size); stream_control(stream, STREAM_CTRL_GET_CACHE_FILL, &stream_cache_fill); stream_control(stream, STREAM_CTRL_GET_CACHE_IDLE, &stream_cache_idle); |