From 9e99a0c8b95980fc5ff7879c6a1b7e6de479b7dc Mon Sep 17 00:00:00 2001
From: wm4 <wm4@nowhere>
Date: Mon, 9 Mar 2015 22:32:04 +0100
Subject: demux_mkv: check for playback aborts

Check async abort notification. libavformat already do something
equivalent.

Before this commit, the demuxer could enter resync mode (and print silly
warning messages) when the stream stopped returning data because of an
abort.

(cherry picked from commit 39fa05d3742aea94c7638c5b9223d680459b7799)
---
 demux/demux.c | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'demux/demux.c')

diff --git a/demux/demux.c b/demux/demux.c
index 06511aaa50..930d19f9cd 100644
--- a/demux/demux.c
+++ b/demux/demux.c
@@ -1378,6 +1378,11 @@ void demux_unpause(demuxer_t *demuxer)
     pthread_mutex_unlock(&in->lock);
 }
 
+bool demux_cancel_test(struct demuxer *demuxer)
+{
+    return mp_cancel_test(demuxer->stream->cancel);
+}
+
 struct demux_chapter *demux_copy_chapter_data(struct demux_chapter *c, int num)
 {
     struct demux_chapter *new = talloc_array(NULL, struct demux_chapter, num);
-- 
cgit v1.2.3