summaryrefslogtreecommitdiffstats
path: root/demux/demux.c
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2018-05-17 20:58:49 +0200
committerwm4 <wm4@nowhere>2018-05-24 19:56:35 +0200
commit31b78ad7fa97d8047b609c1647a273e72612d425 (patch)
treed6a5e960ac431eef46d01b440fd504b1ac1f1159 /demux/demux.c
parent12bd4fe9abce797a3c98dc437579b163e0a8162a (diff)
downloadmpv-31b78ad7fa97d8047b609c1647a273e72612d425.tar.bz2
mpv-31b78ad7fa97d8047b609c1647a273e72612d425.tar.xz
misc: move mp_cancel from stream.c to thread_tools.c
It seems a bit inappropriate to have dumped this into stream.c, even if it's roughly speaking its main user. At least it made its way somewhat unfortunately to other components not related to the stream or demuxer layer at all. I'm too greedy to give this weird helper its own file, so dump it into thread_tools.c. Probably a somewhat pointless change.
Diffstat (limited to 'demux/demux.c')
-rw-r--r--demux/demux.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/demux/demux.c b/demux/demux.c
index f386c3c2ae..0edfaa95bf 100644
--- a/demux/demux.c
+++ b/demux/demux.c
@@ -34,6 +34,7 @@
#include "mpv_talloc.h"
#include "common/msg.h"
#include "common/global.h"
+#include "misc/thread_tools.h"
#include "osdep/atomic.h"
#include "osdep/threads.h"