diff options
| author | Anton Kindestam <antonki@kth.se> | 2018-12-05 19:02:03 +0100 |
|---|---|---|
| committer | Anton Kindestam <antonki@kth.se> | 2018-12-05 19:19:24 +0100 |
| commit | 8b83c8996686072bc743b112ae5cb3bf93aa33ed (patch) | |
| tree | b09ce6a7ff470b05006622f19914b3d39d2f7d9f /demux/demux_lavf.c | |
| parent | 5bcac8580df6fc62323136f756a3a6d1e754fe9c (diff) | |
| parent | 559a400ac36e75a8d73ba263fd7fa6736df1c2da (diff) | |
| download | mpv-8b83c8996686072bc743b112ae5cb3bf93aa33ed.tar.bz2 mpv-8b83c8996686072bc743b112ae5cb3bf93aa33ed.tar.xz | |
Merge commit '559a400ac36e75a8d73ba263fd7fa6736df1c2da' into wm4-commits--merge-edition
This bumps libmpv version to 1.103
Diffstat (limited to 'demux/demux_lavf.c')
| -rw-r--r-- | demux/demux_lavf.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/demux/demux_lavf.c b/demux/demux_lavf.c index b1800018c4..058f13cabf 100644 --- a/demux/demux_lavf.c +++ b/demux/demux_lavf.c @@ -42,6 +42,7 @@ #include "common/av_common.h" #include "misc/bstr.h" #include "misc/charset_conv.h" +#include "misc/thread_tools.h" #include "stream/stream.h" #include "demux.h" @@ -781,8 +782,7 @@ static void update_metadata(demuxer_t *demuxer) static int interrupt_cb(void *ctx) { struct demuxer *demuxer = ctx; - lavf_priv_t *priv = demuxer->priv; - return mp_cancel_test(priv->stream->cancel); + return mp_cancel_test(demuxer->cancel); } static int block_io_open(struct AVFormatContext *s, AVIOContext **pb, |