summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2014-08-04 18:11:12 +0200
committerwm4 <wm4@nowhere>2014-08-04 18:17:30 +0200
commit922b1d8504ff8556bcac663d7446be893e93feca (patch)
tree178bcf30f34662e06b2d4ed720699b2da5ce3c10
parent618361c6979ed9cce5986e97a8588f69b0ffcea8 (diff)
downloadmpv-922b1d8504ff8556bcac663d7446be893e93feca.tar.bz2
mpv-922b1d8504ff8556bcac663d7446be893e93feca.tar.xz
sub: don't read packets if video and audio are disabled
Although disabling both video and audio is surely an obscure corner case, it's allowed, and we don't want the demuxer to skip arbitrary packets. Basically, make the heuristic for checking interleaved files affect external files only.
-rw-r--r--player/sub.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/player/sub.c b/player/sub.c
index 1a9fdcafe7..4478b1092c 100644
--- a/player/sub.c
+++ b/player/sub.c
@@ -64,7 +64,7 @@ static bool is_interleaved(struct MPContext *mpctx, struct track *track)
(other->type == STREAM_VIDEO || other->type == STREAM_AUDIO))
return true;
}
- return false;
+ return track->demuxer == mpctx->demuxer;
}
void reset_subtitles(struct MPContext *mpctx, int order)