From a792f0d628ea6170ce351fc816a2d71e276a8c49 Mon Sep 17 00:00:00 2001
From: wm4 <wm4@nowhere>
Date: Tue, 11 Jun 2013 19:26:57 +0200
Subject: sub: remove redundant condition

---
 core/mplayer.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'core')

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;
 
-- 
cgit v1.2.3