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.
---
 demux/demux_disc.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'demux/demux_disc.c')

diff --git a/demux/demux_disc.c b/demux/demux_disc.c
index afa8de2298..3cbd01a9b8 100644
--- a/demux/demux_disc.c
+++ b/demux/demux_disc.c
@@ -293,9 +293,10 @@ static int d_open(demuxer_t *demuxer, enum demux_check check)
     if (check != DEMUX_CHECK_FORCE)
         return -1;
 
-    char *demux = "+lavf";
+    struct demuxer_params params = {.force_format = "+lavf"};
+
     if (demuxer->stream->uncached_type == STREAMTYPE_CDDA)
-        demux = "+rawaudio";
+        params.force_format = "+rawaudio";
 
     char *t = NULL;
     stream_control(demuxer->stream, STREAM_CTRL_GET_DISC_NAME, &t);
@@ -309,7 +310,7 @@ static int d_open(demuxer_t *demuxer, enum demux_check check)
     stream_peek(demuxer->stream, 1);
     reset_pts(demuxer);
 
-    p->slave = demux_open(demuxer->stream, demux, NULL, demuxer->global);
+    p->slave = demux_open(demuxer->stream, &params, demuxer->global);
     if (!p->slave)
         return -1;
 
-- 
cgit v1.2.3