From d33e5972b38c1a8d1ed2c19095a94c70c33881c3 Mon Sep 17 00:00:00 2001
From: wm4 <wm4@nowhere>
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.
---
 common/playlist.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'common')

diff --git a/common/playlist.c b/common/playlist.c
index 5504b185bc..7572e67780 100644
--- a/common/playlist.c
+++ b/common/playlist.c
@@ -297,7 +297,7 @@ struct playlist *playlist_parse_file(const char *file, struct mp_cancel *cancel,
                          "pass it to the player\ndirectly. Don't use --playlist.\n");
         }
     }
-    free_demuxer_and_stream(d);
+    demux_free(d);
 
     if (ret) {
         mp_verbose(log, "Playlist successfully parsed\n");
-- 
cgit v1.2.3