From b3dff290010e2afa2ad42fa1334a368d102cd79d Mon Sep 17 00:00:00 2001 From: wm4 Date: Mon, 22 Jul 2013 14:48:41 +0200 Subject: 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. --- core/mplayer.c | 2 +- demux/demux.c | 2 -- 2 files changed, 1 insertion(+), 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 @@ -580,8 +580,6 @@ struct demuxer *demux_open(struct stream *stream, char *force_format, const int *check_levels = d_normal; const struct demuxer_desc *check_desc = NULL; - if (!force_format) - force_format = opts->demuxer_name; if (!force_format) force_format = stream->demuxer; -- cgit v1.2.3