RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-02-16 20:27:23 +00:00
Code Issues Releases Wiki Activity

core: make --demuxer not affect external subtitles

Browse Source 
This also affects --audiofile. The previous behavior wasn't really
useful. There are even separate switches for that: --audio-demuxer and
--sub-demuxer.
This commit is contained in:
wm4 2013-07-22 14:48:41 +02:00
parent c729df3d10
commit b3dff29001
2 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/mplayer.c
View File

@ -4230,7 +4230,7 @@ goto_reopen_demuxer: ;
mpctx->audio_delay = opts->audio_delay; 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; mpctx->master_demuxer = mpctx->demuxer;
if (!mpctx->demuxer) { if (!mpctx->demuxer) {

2
demux/demux.c
View File

@ -580,8 +580,6 @@ struct demuxer *demux_open(struct stream *stream, char *force_format,
const int *check_levels = d_normal; const int *check_levels = d_normal;
const struct demuxer_desc *check_desc = NULL; const struct demuxer_desc *check_desc = NULL;
if (!force_format)
force_format = opts->demuxer_name;
if (!force_format) if (!force_format)
force_format = stream->demuxer; force_format = stream->demuxer;