diff options
author | wm4 <wm4@nowhere> | 2018-05-19 14:41:06 +0200 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2018-05-24 19:56:35 +0200 |
commit | d33e5972b38c1a8d1ed2c19095a94c70c33881c3 (patch) | |
tree | 40b2ff985f51f53505ddd5985df4abe2ba97eced /demux/demux_timeline.c | |
parent | 562d8e6d3236022a77e49a17948e25e493538f04 (diff) | |
download | mpv-d33e5972b38c1a8d1ed2c19095a94c70c33881c3.tar.bz2 mpv-d33e5972b38c1a8d1ed2c19095a94c70c33881c3.tar.xz |
demux: get rid of free_demuxer[_and_stream]()
Them being separate is just dumb. Replace them with a single
demux_free() function, and free its stream by default. Not freeing the
stream is only needed in 1 special case (demux_disc.c), use a special
flag to not free the stream in this case.
Diffstat (limited to 'demux/demux_timeline.c')
-rw-r--r-- | demux/demux_timeline.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/demux/demux_timeline.c b/demux/demux_timeline.c index 9d92d1879d..1eb73956c3 100644 --- a/demux/demux_timeline.c +++ b/demux/demux_timeline.c @@ -147,7 +147,7 @@ static void close_lazy_segments(struct demuxer *demuxer) for (int n = 0; n < p->num_segments; n++) { struct segment *seg = p->segments[n]; if (seg != p->current && seg->d && seg->lazy) { - free_demuxer_and_stream(seg->d); + demux_free(seg->d); seg->d = NULL; } } @@ -431,7 +431,7 @@ static void d_close(struct demuxer *demuxer) p->current = NULL; close_lazy_segments(demuxer); timeline_destroy(p->tl); - free_demuxer(master); + demux_free(master); } static int d_control(struct demuxer *demuxer, int cmd, void *arg) |