From d33e5972b38c1a8d1ed2c19095a94c70c33881c3 Mon Sep 17 00:00:00 2001 From: wm4 Date: Sat, 19 May 2018 14:41:06 +0200 Subject: 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. --- player/loadfile.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'player') 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); -- cgit v1.2.3