From 288eaacd85b62c73fbffa06cc46eb9a58ea48a1b Mon Sep 17 00:00:00 2001 From: wm4 Date: Tue, 6 Oct 2015 18:18:18 +0200 Subject: demux: don't attempt to open a demuxer after abort signal was given demux_open() kept trying to fallback to other demuxers when opening was cancelled. This was not really a problem, but it was stupid. --- demux/demux.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/demux/demux.c b/demux/demux.c index 5028afa15e..e094d23222 100644 --- a/demux/demux.c +++ b/demux/demux.c @@ -939,6 +939,9 @@ static struct demuxer *open_given_type(struct mpv_global *global, struct demuxer_params *params, enum demux_check check) { + if (mp_cancel_test(stream->cancel)) + return NULL; + struct demuxer *demuxer = talloc_ptrtype(NULL, demuxer); *demuxer = (struct demuxer) { .desc = desc, -- cgit v1.2.3