diff options
| author | wm4 <wm4@nowhere> | 2018-05-17 20:58:49 +0200 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2018-05-24 19:56:35 +0200 |
| commit | 31b78ad7fa97d8047b609c1647a273e72612d425 (patch) | |
| tree | d6a5e960ac431eef46d01b440fd504b1ac1f1159 /demux | |
| parent | 12bd4fe9abce797a3c98dc437579b163e0a8162a (diff) | |
| download | mpv-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')
| -rw-r--r-- | demux/demux.c | 1 | ||||
| -rw-r--r-- | demux/demux_lavf.c | 1 | ||||
| -rw-r--r-- | demux/demux_mkv_timeline.c | 1 | ||||
| -rw-r--r-- | demux/demux_playlist.c | 1 |
4 files changed, 4 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" diff --git a/demux/demux_lavf.c b/demux/demux_lavf.c index 60ae878398..a0b5ff7472 100644 --- a/demux/demux_lavf.c +++ b/demux/demux_lavf.c @@ -42,6 +42,7 @@ #include "common/av_common.h" #include "misc/bstr.h" #include "misc/charset_conv.h" +#include "misc/thread_tools.h" #include "stream/stream.h" #include "demux.h" diff --git a/demux/demux_mkv_timeline.c b/demux/demux_mkv_timeline.c index 3ad24eb8a5..277ff9c1ee 100644 --- a/demux/demux_mkv_timeline.c +++ b/demux/demux_mkv_timeline.c @@ -39,6 +39,7 @@ #include "options/options.h" #include "options/path.h" #include "misc/bstr.h" +#include "misc/thread_tools.h" #include "common/common.h" #include "common/playlist.h" #include "stream/stream.h" diff --git a/demux/demux_playlist.c b/demux/demux_playlist.c index 3a65ada451..0aa542534d 100644 --- a/demux/demux_playlist.c +++ b/demux/demux_playlist.c @@ -25,6 +25,7 @@ #include "options/options.h" #include "common/msg.h" #include "common/playlist.h" +#include "misc/thread_tools.h" #include "options/path.h" #include "stream/stream.h" #include "osdep/io.h" |