diff options
author | wm4 <wm4@nowhere> | 2015-02-20 21:21:14 +0100 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2015-02-20 21:21:14 +0100 |
commit | 6aa6778ac46672dd237acc86856353d133917f06 (patch) | |
tree | d7e19e4c35ea99193b826fcd78e975c1bc376f62 /demux/demux_disc.c | |
parent | 6c1355be967751b194504ed73b053846fbae5fa9 (diff) | |
download | mpv-6aa6778ac46672dd237acc86856353d133917f06.tar.bz2 mpv-6aa6778ac46672dd237acc86856353d133917f06.tar.xz |
demux: change demux_open() signature
Fold the relatively obscure force_format parameter into demuxer_params.
Diffstat (limited to 'demux/demux_disc.c')
-rw-r--r-- | demux/demux_disc.c | 7 |
1 files changed, 4 insertions, 3 deletions
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, ¶ms, demuxer->global); if (!p->slave) return -1; |