From 8e56fda7d43d38882731057d33f61daa3f91b5b3 Mon Sep 17 00:00:00 2001 From: reimar Date: Sun, 19 Nov 2006 19:39:16 +0000 Subject: [PATCH] Remove superfluous demuxer->type==DEMUXER_TYPE_MATROSKA check, d_dvdsub->id >= 0 is enough in for this case, too. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21077 b3059339-0415-0410-9bf9-f77b7e298cf2 --- mplayer.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/mplayer.c b/mplayer.c index c0945f1a31..f6a5aada70 100644 --- a/mplayer.c +++ b/mplayer.c @@ -4236,8 +4236,7 @@ demux_info_print(demuxer); //================== Read SUBTITLES (DVD & TEXT) ========================== if(vo_spudec==NULL && sh_video && - (stream->type==STREAMTYPE_DVD || demuxer->type==DEMUXER_TYPE_MATROSKA || - d_dvdsub->id >= 0)){ + (stream->type==STREAMTYPE_DVD || d_dvdsub->id >= 0)){ if (spudec_ifo) { unsigned int palette[16], width, height;