From db69d933c116f80c3e02f1cbc0e2df28bf993d56 Mon Sep 17 00:00:00 2001
From: nicodvb <nicodvb@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Mon, 2 Jan 2006 20:40:25 +0000
Subject: don't reset dvdsub->id unless -slang is specified; assign default sub
 stream id when demux->sub->id is -1 (autodetect)

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17287 b3059339-0415-0410-9bf9-f77b7e298cf2
---
 mplayer.c | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'mplayer.c')

diff --git a/mplayer.c b/mplayer.c
index 3e8002f8ca..f50eca4cee 100644
--- a/mplayer.c
+++ b/mplayer.c
@@ -3794,8 +3794,10 @@ if (stream->type==STREAMTYPE_DVDNAV && dvd_nav_still)
         vo_sub_last = vo_sub = NULL;
 #endif
         vobsub_id = -1;
+	if(dvdsub_lang) {
         dvdsub_id = -1;
         if (d_dvdsub) d_dvdsub->id = -1;
+	}
 
         // be careful!
         // if sub_changed is till on but subdata's been reset, bad things happen.
-- 
cgit v1.2.3