mirror of
https://github.com/mpv-player/mpv.git
synced 2025-12-28 05:33:14 +00:00
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.
This commit is contained in:
@@ -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");
|
||||
|
||||
Reference in New Issue
Block a user