[Mplayer-cvslog] CVS: main/libmpdemux open.c,1.47,1.48

[Alban Bedel CVS]

Update of /cvsroot/mplayer/main/libmpdemux
In directory mail:/var/tmp.root/cvs-serv20949/libmpdemux

Modified Files:
	open.c 
Log Message:
filename can be NULL. Fix the conflict between cdda and dvdnav.


Index: open.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/open.c,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- open.c	21 Jun 2002 16:26:40 -0000	1.47
+++ open.c	21 Jun 2002 22:52:01 -0000	1.48
@@ -86,9 +86,9 @@
 #endif
 
 #ifdef HAVE_CDDA
-if(strncmp("cdda://",filename,7) == 0)
+if(filename && strncmp("cdda://",filename,7) == 0)
   return open_cdda(cdrom_device ? cdrom_device : DEFAULT_CDROM_DEVICE,filename+7);
-if(strncmp("cddb://",filename,7) == 0)
+if(filename && strncmp("cddb://",filename,7) == 0)
   return cddb_open(cdrom_device ? cdrom_device : DEFAULT_CDROM_DEVICE,filename+7);
 #endif