summaryrefslogtreecommitdiffstats
path: root/player/loadfile.c
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2015-02-20 21:21:14 +0100
committerwm4 <wm4@nowhere>2015-02-20 21:21:14 +0100
commit6aa6778ac46672dd237acc86856353d133917f06 (patch)
treed7e19e4c35ea99193b826fcd78e975c1bc376f62 /player/loadfile.c
parent6c1355be967751b194504ed73b053846fbae5fa9 (diff)
downloadmpv-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 'player/loadfile.c')
-rw-r--r--player/loadfile.c20
1 files changed, 10 insertions, 10 deletions
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);
}