diff options
Diffstat (limited to 'libmpdemux')
| -rw-r--r-- | libmpdemux/demux_mkv.c | 2 | ||||
| -rw-r--r-- | libmpdemux/demuxer.c | 8 |
2 files changed, 7 insertions, 3 deletions
diff --git a/libmpdemux/demux_mkv.c b/libmpdemux/demux_mkv.c index f1e41f5f6e..c93d67180e 100644 --- a/libmpdemux/demux_mkv.c +++ b/libmpdemux/demux_mkv.c @@ -470,7 +470,7 @@ static void parse_trackencodings(struct demuxer *demuxer, else if (e.comp_algo == 0) { mp_tmsg(MSGT_DEMUX, MSGL_WARN, "[mkv] Track %u was compressed with zlib " - "but mplayer has not been compiled\n" + "but mpv has not been compiled\n" "[mkv] with support for zlib compression. " "Skipping track.\n", track->tnum); diff --git a/libmpdemux/demuxer.c b/libmpdemux/demuxer.c index 2706f3a9ea..55b5d0f1c0 100644 --- a/libmpdemux/demuxer.c +++ b/libmpdemux/demuxer.c @@ -1223,9 +1223,13 @@ void demuxer_switch_track(struct demuxer *demuxer, enum stream_type type, assert(!stream || stream->type == type); int index = stream ? stream->tid : -2; if (type == STREAM_AUDIO) { - demux_control(demuxer, DEMUXER_CTRL_SWITCH_AUDIO, &index); + if (demux_control(demuxer, DEMUXER_CTRL_SWITCH_AUDIO, &index) + == DEMUXER_CTRL_NOTIMPL) + demuxer->audio->id = index; } else if (type == STREAM_VIDEO) { - demux_control(demuxer, DEMUXER_CTRL_SWITCH_VIDEO, &index); + if (demux_control(demuxer, DEMUXER_CTRL_SWITCH_VIDEO, &index) + == DEMUXER_CTRL_NOTIMPL) + demuxer->video->id = index; } else if (type == STREAM_SUB) { int index2 = stream ? stream->stream_index : -2; if (demuxer->ds[type]->id != index2) |