summaryrefslogtreecommitdiffstats
path: root/mplayer.c
diff options
context:
space:
mode:
authornicodvb <nicodvb@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-01-02 20:40:25 +0000
committernicodvb <nicodvb@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-01-02 20:40:25 +0000
commitdb69d933c116f80c3e02f1cbc0e2df28bf993d56 (patch)
tree19690fcfc52ce6713f2b8ecdf76e2ab8bef933f9 /mplayer.c
parent6193679753e42999894580efe1f8b95bd0f8b304 (diff)
downloadmpv-db69d933c116f80c3e02f1cbc0e2df28bf993d56.tar.bz2
mpv-db69d933c116f80c3e02f1cbc0e2df28bf993d56.tar.xz
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
Diffstat (limited to 'mplayer.c')
-rw-r--r--mplayer.c2
1 files changed, 2 insertions, 0 deletions
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.