summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2013-06-11 19:26:57 +0200
committerwm4 <wm4@nowhere>2013-06-23 22:33:59 +0200
commita792f0d628ea6170ce351fc816a2d71e276a8c49 (patch)
tree19e9780717e9816a041e927c856f66a7022ea564 /core
parent4f5e12136de717896bf322e75d42de1af09e1c3e (diff)
downloadmpv-a792f0d628ea6170ce351fc816a2d71e276a8c49.tar.bz2
mpv-a792f0d628ea6170ce351fc816a2d71e276a8c49.tar.xz
sub: remove redundant condition
Diffstat (limited to 'core')
-rw-r--r--core/mplayer.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/core/mplayer.c b/core/mplayer.c
index 86260a0598..d9c577b354 100644
--- a/core/mplayer.c
+++ b/core/mplayer.c
@@ -2010,7 +2010,8 @@ static void reinit_subs(struct MPContext *mpctx)
if (!mpctx->sh_sub->dec_sub)
mpctx->sh_sub->dec_sub = sub_create(opts);
- if (track->demuxer && !track->stream) {
+ assert(track->demuxer);
+ if (!track->stream) {
// Lazily added DVD track - we must not miss the first subtitle packet,
// which makes the demuxer create the sh_stream, and contains the first
// subtitle event.
@@ -2025,7 +2026,6 @@ static void reinit_subs(struct MPContext *mpctx)
return;
}
- assert(track->demuxer && track->stream);
mpctx->initialized_flags |= INITIALIZED_SUB;