[MPlayer-cvslog] r29095 - trunk/libmpdemux/demuxer.c

[reimar]

Author: reimar
Date: Sun Mar 29 13:21:18 2009
New Revision: 29095

Log:
Update demuxer->sub->id and demuxer->sub->sh if a new subtitle stream is
created that matches the user-requested one.
Fixes -slang and -sid with DVDs (anything that uses demux_mpg actually).

Modified:
   trunk/libmpdemux/demuxer.c

Modified: trunk/libmpdemux/demuxer.c
==============================================================================
--- trunk/libmpdemux/demuxer.c	Sun Mar 29 13:16:14 2009	(r29094)
+++ trunk/libmpdemux/demuxer.c	Sun Mar 29 13:21:18 2009	(r29095)
@@ -259,6 +259,10 @@ sh_sub_t *new_sh_sub_sid(demuxer_t *demu
         sh->sid = sid;
         mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_SUBTITLE_ID=%d\n", sid);
     }
+    if (sid == dvdsub_id) {
+        demuxer->sub->id = id;
+        demuxer->sub->sh = demuxer->s_streams[id];
+    }
     return demuxer->s_streams[id];
 }