diff options
| author |  wm4 <wm4@nowhere> | 2013-07-22 14:48:41 +0200 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2013-07-22 15:11:04 +0200 |
| commit | b3dff290010e2afa2ad42fa1334a368d102cd79d (patch) | |
| tree | 15fce7d850ffc6367f28356c347d2a95e2505443 /core | |
| parent | c729df3d10f917c4bbbd18997fce6ea173bba0dd (diff) | |
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.
Diffstat (limited to 'core')
| -rw-r--r-- | core/mplayer.c | 2 |
1 files changed, 1 insertions, 1 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) { |