summaryrefslogtreecommitdiffstats
path: root/mplayer.c
diff options
context:
space:
mode:
authorreimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-11-19 19:39:16 +0000
committerreimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-11-19 19:39:16 +0000
commit8e56fda7d43d38882731057d33f61daa3f91b5b3 (patch)
treee76e5e6af5a1efa992fcfd7480755befa887c8af /mplayer.c
parentdbbe73116c5b2f09a2d72e5f8fe2069a8657e1ea (diff)
downloadmpv-8e56fda7d43d38882731057d33f61daa3f91b5b3.tar.bz2
mpv-8e56fda7d43d38882731057d33f61daa3f91b5b3.tar.xz
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
Diffstat (limited to 'mplayer.c')
-rw-r--r--mplayer.c3
1 files changed, 1 insertions, 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;