diff options
| author | wm4 <wm4@nowhere> | 2018-05-18 15:48:14 +0200 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2018-05-24 19:56:35 +0200 |
| commit | f9713921a372aa14ea631b0c546d3fbeade32b71 (patch) | |
| tree | d3a8b403fe6272f5b89e27f82cd210e05d82aa56 /demux/demux_timeline.c | |
| parent | a0cce7f775e97aa364d166c278c49df1325e6cc7 (diff) | |
| download | mpv-f9713921a372aa14ea631b0c546d3fbeade32b71.tar.bz2 mpv-f9713921a372aa14ea631b0c546d3fbeade32b71.tar.xz | |
demux: add a "cancel" field
Instead of relying on demuxer->stream->cancel. This is better because
the stream is potentially closed and replaced.
Diffstat (limited to 'demux/demux_timeline.c')
| -rw-r--r-- | demux/demux_timeline.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/demux/demux_timeline.c b/demux/demux_timeline.c index 4b9b3124fa..9d92d1879d 100644 --- a/demux/demux_timeline.c +++ b/demux/demux_timeline.c @@ -167,7 +167,7 @@ static void reopen_lazy_segments(struct demuxer *demuxer) .skip_lavf_probing = true, }; p->current->d = demux_open_url(p->current->url, ¶ms, - demuxer->stream->cancel, demuxer->global); + demuxer->cancel, demuxer->global); if (!p->current->d && !demux_cancel_test(demuxer)) MP_ERR(demuxer, "failed to load segment\n"); if (p->current->d) |