diff options
author | wm4 <wm4@nowhere> | 2018-05-19 17:06:00 +0200 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2018-05-24 19:56:35 +0200 |
commit | 29a51900c6047798244afaca271618caeeeeeee8 (patch) | |
tree | 3e73ce26d1eab368df29731b2880c0bd0b46c37f /demux/demux.h | |
parent | d33e5972b38c1a8d1ed2c19095a94c70c33881c3 (diff) | |
download | mpv-29a51900c6047798244afaca271618caeeeeeee8.tar.bz2 mpv-29a51900c6047798244afaca271618caeeeeeee8.tar.xz |
player: some further cleanup of the mp_cancel crap
Alway give each demuxer its own mp_cancel instance. This makes
management of the mp_cancel things much easier. Also, instead of having
add/remove functions for mp_cancel slaves, replace them with a simpler
to use set_parent function. Remove cancel_and_free_demuxer(), which had
mpctx as parameter only to check an assumption. With this commit,
demuxers have their own mp_cancel, so add demux_cancel_and_free() which
makes use of it.
Diffstat (limited to 'demux/demux.h')
-rw-r--r-- | demux/demux.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/demux/demux.h b/demux/demux.h index 6a8a08d8df..f5b203590f 100644 --- a/demux/demux.h +++ b/demux/demux.h @@ -251,6 +251,7 @@ typedef struct { } demux_program_t; void demux_free(struct demuxer *demuxer); +void demux_cancel_and_free(struct demuxer *demuxer); void demux_add_packet(struct sh_stream *stream, demux_packet_t *dp); void demuxer_feed_caption(struct sh_stream *stream, demux_packet_t *dp); |