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 /player/loadfile.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 'player/loadfile.c')
-rw-r--r-- | player/loadfile.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/player/loadfile.c b/player/loadfile.c index a948d1d03d..297ab8ba97 100644 --- a/player/loadfile.c +++ b/player/loadfile.c @@ -136,7 +136,7 @@ static void cancel_and_free_demuxer(struct MPContext *mpctx, if (cancel) mp_cancel_trigger(cancel); - free_demuxer_and_stream(*demuxer); + demux_free(*demuxer); *demuxer = NULL; talloc_free(cancel); |