aboutsummaryrefslogtreecommitdiffhomepage
path: root/demux
diff options
context:
space:
mode:
authorGravatar wm4 <wm4@nowhere>2015-10-06 18:18:18 +0200
committerGravatar wm4 <wm4@nowhere>2015-10-06 18:19:20 +0200
commit288eaacd85b62c73fbffa06cc46eb9a58ea48a1b (patch)
tree230ddb66e23e2cccc04cc9ecaaca13e3fc4c0e17 /demux
parentecb776f88efdc7df6d0493ce97ab44528704272f (diff)
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.
Diffstat (limited to 'demux')
-rw-r--r--demux/demux.c3
1 files changed, 3 insertions, 0 deletions
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,