summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2013-07-22 14:48:41 +0200
committerwm4 <wm4@nowhere>2013-07-22 15:11:04 +0200
commitb3dff290010e2afa2ad42fa1334a368d102cd79d (patch)
tree15fce7d850ffc6367f28356c347d2a95e2505443
parentc729df3d10f917c4bbbd18997fce6ea173bba0dd (diff)
downloadmpv-b3dff290010e2afa2ad42fa1334a368d102cd79d.tar.bz2
mpv-b3dff290010e2afa2ad42fa1334a368d102cd79d.tar.xz
core: make --demuxer not affect external subtitles
This also affects --audiofile. The previous behavior wasn't really useful. There are even separate switches for that: --audio-demuxer and --sub-demuxer.
-rw-r--r--core/mplayer.c2
-rw-r--r--demux/demux.c2
2 files changed, 1 insertions, 3 deletions
diff --git a/core/mplayer.c b/core/mplayer.c
index d9c03dace5..a4b68f7402 100644
--- a/core/mplayer.c
+++ b/core/mplayer.c
@@ -4230,7 +4230,7 @@ goto_reopen_demuxer: ;
mpctx->audio_delay = opts->audio_delay;
- mpctx->demuxer = demux_open(mpctx->stream, NULL, NULL, opts);
+ mpctx->demuxer = demux_open(mpctx->stream, opts->demuxer_name, NULL, opts);
mpctx->master_demuxer = mpctx->demuxer;
if (!mpctx->demuxer) {
diff --git a/demux/demux.c b/demux/demux.c
index 1783f92c96..873821f250 100644
--- a/demux/demux.c
+++ b/demux/demux.c
@@ -581,8 +581,6 @@ struct demuxer *demux_open(struct stream *stream, char *force_format,
const struct demuxer_desc *check_desc = NULL;
if (!force_format)
- force_format = opts->demuxer_name;
- if (!force_format)
force_format = stream->demuxer;
if (force_format && force_format[0]) {