3 files changed, 10 insertions, 35 deletions

diff --git a/core/timeline/tl_cue.c b/core/timeline/tl_cue.c
index d9160e0b8e..1953f46116 100644
--- a/core/timeline/tl_cue.c
+++ b/core/timeline/tl_cue.c
@@ -188,15 +188,10 @@ static bool try_open(struct MPContext *mpctx, char *filename)
         || bstrcasecmp(bstr0(mpctx->demuxer->filename), bfilename) == 0)
         return false;
 
-    int format = 0;
-    struct stream *s = open_stream(filename, &mpctx->opts, &format);
+    struct stream *s = stream_open(filename, &mpctx->opts);
     if (!s)
         return false;
-    struct demuxer *d = demux_open(&mpctx->opts, s, format,
-                                    mpctx->opts.audio_id,
-                                    mpctx->opts.video_id,
-                                    mpctx->opts.sub_id,
-                                    filename);
+    struct demuxer *d = demux_open(s, NULL, NULL, &mpctx->opts);
     // Since .bin files are raw PCM data with no headers, we have to explicitly
     // open them. Also, try to avoid to open files that are most likely not .bin
     // files, as that would only play noise. Checking the file extension is
@@ -205,11 +200,7 @@ static bool try_open(struct MPContext *mpctx, char *filename)
     //       CD sector size (2352 bytes)
     if (!d && bstr_case_endswith(bfilename, bstr0(".bin"))) {
         mp_msg(MSGT_CPLAYER, MSGL_WARN, "CUE: Opening as BIN file!\n");
-        d = demux_open(&mpctx->opts, s, DEMUXER_TYPE_RAWAUDIO,
-                       mpctx->opts.audio_id,
-                       mpctx->opts.video_id,
-                       mpctx->opts.sub_id,
-                       filename);
+        d = demux_open(s, "rawaudio", NULL, &mpctx->opts);
     }
     if (d) {
         add_source(mpctx, d);
diff --git a/core/timeline/tl_edl.c b/core/timeline/tl_edl.c
index 5ec04ac716..6096d03b6a 100644
--- a/core/timeline/tl_edl.c
+++ b/core/timeline/tl_edl.c
@@ -354,16 +354,10 @@ void build_edl_timeline(struct MPContext *mpctx)
     mpctx->num_sources = 1;
 
     for (int i = 0; i < num_sources; i++) {
-        int format = 0;
-        struct stream *s = open_stream(edl_ids[i].filename, &mpctx->opts,
-                                       &format);
+        struct stream *s = stream_open(edl_ids[i].filename, &mpctx->opts);
         if (!s)
             goto openfail;
-        struct demuxer *d = demux_open(&mpctx->opts, s, format,
-                                       mpctx->opts.audio_id,
-                                       mpctx->opts.video_id,
-                                       mpctx->opts.sub_id,
-                                       edl_ids[i].filename);
+        struct demuxer *d = demux_open(s, NULL, NULL, &mpctx->opts);
         if (!d) {
             free_stream(s);
         openfail:
diff --git a/core/timeline/tl_matroska.c b/core/timeline/tl_matroska.c
index 098c02fd9f..7c100618a3 100644
--- a/core/timeline/tl_matroska.c
+++ b/core/timeline/tl_matroska.c
@@ -113,14 +113,6 @@ static char **find_files(const char *original_file, const char *suffix)
     return results;
 }
 
-static struct demuxer *open_demuxer(struct stream *stream,
-        struct MPContext *mpctx, char *filename, struct demuxer_params *params)
-{
-    return demux_open_withparams(&mpctx->opts, stream,
-                DEMUXER_TYPE_MATROSKA, NULL, mpctx->opts.audio_id,
-                mpctx->opts.video_id, mpctx->opts.sub_id, filename, params);
-}
-
 static int enable_cache(struct MPContext *mpctx, struct stream **stream,
                         struct demuxer **demuxer, struct demuxer_params *params)
 {
@@ -133,8 +125,7 @@ static int enable_cache(struct MPContext *mpctx, struct stream **stream,
     free_demuxer(*demuxer);
     free_stream(*stream);
 
-    int format = 0;
-    *stream = open_stream(filename, &mpctx->opts, &format);
+    *stream = stream_open(filename, &mpctx->opts);
     if (!*stream) {
         talloc_free(filename);
         return -1;
@@ -146,7 +137,7 @@ static int enable_cache(struct MPContext *mpctx, struct stream **stream,
                                 opts->stream_cache_min_percent,
                                 opts->stream_cache_seek_min_percent);
 
-    *demuxer = open_demuxer(*stream, mpctx, filename, params);
+    *demuxer = demux_open(*stream, "mkv", params, &mpctx->opts);
     if (!*demuxer) {
         talloc_free(filename);
         free_stream(*stream);
@@ -168,17 +159,16 @@ static bool check_file_seg(struct MPContext *mpctx, struct demuxer **sources,
         .matroska_wanted_segment = segment,
         .matroska_was_valid = &was_valid,
     };
-    int format = 0;
-    struct stream *s = open_stream(filename, &mpctx->opts, &format);
+    struct stream *s = stream_open(filename, &mpctx->opts);
     if (!s)
         return false;
-    struct demuxer *d = open_demuxer(s, mpctx, filename, &params);
+    struct demuxer *d = demux_open(s, "mkv", &params, &mpctx->opts);
 
     if (!d) {
         free_stream(s);
         return was_valid;
     }
-    if (d->file_format == DEMUXER_TYPE_MATROSKA) {
+    if (d->type == DEMUXER_TYPE_MATROSKA) {
         for (int i = 1; i < num_sources; i++) {
             if (sources[i])
                 continue;