[MPlayer-cvslog] CVS: main/libmpdemux demux_mpg.c,1.66,1.67

[Nico Sabbi CVS]

CVS change done by Nico Sabbi CVS

Update of /cvsroot/mplayer/main/libmpdemux
In directory mail:/var2/tmp/cvs-serv21305/libmpdemux

Modified Files:
	demux_mpg.c 
Log Message:
don't reset dvdsub->id unless -slang is specified; assign default sub stream id when demux->sub->id is -1 (autodetect) 

Index: demux_mpg.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/demux_mpg.c,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- demux_mpg.c	30 Oct 2005 09:19:05 -0000	1.66
+++ demux_mpg.c	2 Jan 2006 20:40:25 -0000	1.67
@@ -36,6 +36,7 @@
   int a_stream_ids[MAX_A_STREAMS];
 } mpg_demuxer_t;
 
+extern char* dvdsub_lang;
 static int mpeg_pts_error=0;
 
 static int parse_psm(demuxer_t *demux, int len) {
@@ -293,6 +294,10 @@
             demux->s_streams[aid]=1;
         }
 
+        if(demux->sub->id > -1)
+          demux->sub->id &= 0x1F;
+        if(!dvdsub_lang && demux->sub->id == -1)
+          demux->sub->id = aid;
         if(demux->sub->id==aid){
             ds=demux->sub;
         }