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/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/timeline.c')
| -rw-r--r-- | demux/timeline.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/demux/timeline.c b/demux/timeline.c index c53170b623..c44f67b166 100644 --- a/demux/timeline.c +++ b/demux/timeline.c @@ -34,9 +34,9 @@ void timeline_destroy(struct timeline *tl) for (int n = 0; n < tl->num_sources; n++) { struct demuxer *d = tl->sources[n]; if (d != tl->demuxer && d != tl->track_layout) - free_demuxer_and_stream(d); + demux_free(d); } if (tl->track_layout && tl->track_layout != tl->demuxer) - free_demuxer_and_stream(tl->track_layout); + demux_free(tl->track_layout); talloc_free(tl); } |