[MPlayer-cvslog] CVS: main mplayer.c,1.819,1.820

[Reimar Döffinger CVS]

CVS change done by Reimar Döffinger CVS

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

Modified Files:
	mplayer.c 
Log Message:
Hopefully fixes problems with non-working vobsubs.
Applied so it gets some testing before release.


Index: mplayer.c
===================================================================
RCS file: /cvsroot/mplayer/main/mplayer.c,v
retrieving revision 1.819
retrieving revision 1.820
diff -u -r1.819 -r1.820
--- mplayer.c	17 Dec 2004 16:23:50 -0000	1.819
+++ mplayer.c	19 Dec 2004 16:59:39 -0000	1.820
@@ -1801,7 +1801,9 @@
 demux_info_print(demuxer);
 
 //================== Read SUBTITLES (DVD & TEXT) ==========================
-if(vo_spudec==NULL && sh_video && (stream->type==STREAMTYPE_DVD || demuxer->type==DEMUXER_TYPE_MATROSKA)){
+if(vo_spudec==NULL && sh_video &&
+     (stream->type==STREAMTYPE_DVD || demuxer->type==DEMUXER_TYPE_MATROSKA ||
+      d_dvdsub->id >= 0)){
 
 if (spudec_ifo) {
   unsigned int palette[16], width, height;