From f9713921a372aa14ea631b0c546d3fbeade32b71 Mon Sep 17 00:00:00 2001
From: wm4 <wm4@nowhere>
Date: Fri, 18 May 2018 15:48:14 +0200
Subject: demux: add a "cancel" field

Instead of relying on demuxer->stream->cancel. This is better because
the stream is potentially closed and replaced.
---
 demux/demux_lavf.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'demux/demux_lavf.c')

diff --git a/demux/demux_lavf.c b/demux/demux_lavf.c
index a0b5ff7472..41c334d309 100644
--- a/demux/demux_lavf.c
+++ b/demux/demux_lavf.c
@@ -775,8 +775,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,
-- 
cgit v1.2.3