From 6aa6778ac46672dd237acc86856353d133917f06 Mon Sep 17 00:00:00 2001
From: wm4 <wm4@nowhere>
Date: Fri, 20 Feb 2015 21:21:14 +0100
Subject: demux: change demux_open() signature

Fold the relatively obscure force_format parameter into demuxer_params.
---
 player/loadfile.c | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

(limited to 'player/loadfile.c')

diff --git a/player/loadfile.c b/player/loadfile.c
index c6f0c137be..66f114b606 100644
--- a/player/loadfile.c
+++ b/player/loadfile.c
@@ -689,21 +689,20 @@ struct track *mp_add_external_file(struct MPContext *mpctx, char *filename,
         goto err_out;
     stream_enable_cache(&stream, &opts->stream_cache);
 
-    char *demuxer_name = NULL;
+    struct demuxer_params params = {
+        .expect_subtitle = filter == STREAM_SUB,
+    };
+
     switch (filter) {
     case STREAM_SUB:
-        demuxer_name = opts->sub_demuxer_name;
+        params.force_format = opts->sub_demuxer_name;
         break;
     case STREAM_AUDIO:
-        demuxer_name = opts->audio_demuxer_name;
+        params.force_format = opts->audio_demuxer_name;
         break;
     }
 
-    struct demuxer_params params = {
-        .expect_subtitle = filter == STREAM_SUB,
-    };
-    struct demuxer *demuxer =
-        demux_open(stream, demuxer_name, &params, mpctx->global);
+    struct demuxer *demuxer = demux_open(stream, &params, mpctx->global);
     if (!demuxer) {
         free_stream(stream);
         goto err_out;
@@ -888,7 +887,7 @@ static void load_chapters(struct MPContext *mpctx)
         struct stream *stream = stream_create(chapter_file, STREAM_READ,
                                         mpctx->playback_abort, mpctx->global);
         if (stream) {
-            struct demuxer *demux = demux_open(stream, NULL, NULL, mpctx->global);
+            struct demuxer *demux = demux_open(stream, NULL, mpctx->global);
             if (demux) {
                 src = demux;
                 free_src = true;
@@ -966,7 +965,8 @@ static void open_demux_thread(void *pctx)
     struct demux_open_args *args = pctx;
     struct stream *s = args->stream;
     struct mpv_global *global = args->global;
-    args->demux = demux_open(s, global->opts->demuxer_name, NULL, global);
+    struct demuxer_params p = {.force_format = global->opts->demuxer_name};
+    args->demux = demux_open(s, &p, global);
     if (args->demux)
         args->tl = timeline_load(global, args->log, args->demux);
 }
-- 
cgit v1.2.3