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_disc.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_disc.c')
| -rw-r--r-- | demux/demux_disc.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/demux/demux_disc.c b/demux/demux_disc.c index 2b81350ea4..15ccb2313d 100644 --- a/demux/demux_disc.c +++ b/demux/demux_disc.c @@ -285,7 +285,10 @@ static int d_open(demuxer_t *demuxer, enum demux_check check) if (check != DEMUX_CHECK_FORCE) return -1; - struct demuxer_params params = {.force_format = "+lavf"}; + struct demuxer_params params = { + .force_format = "+lavf", + .does_not_own_stream = true, + }; struct stream *cur = demuxer->stream; const char *sname = ""; @@ -350,7 +353,7 @@ static int d_open(demuxer_t *demuxer, enum demux_check check) static void d_close(demuxer_t *demuxer) { struct priv *p = demuxer->priv; - free_demuxer(p->slave); + demux_free(p->slave); } static int d_control(demuxer_t *demuxer, int cmd, void *arg) |