Mercurial > mplayer.hg

diff libmpdemux/open.c @ 6490:d7605d08b32f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
filename can be NULL. Fix the conflict between cdda and dvdnav.
author albeu
date Fri, 21 Jun 2002 22:52:01 +0000
parents 45ec7f24de06
children 8f49c75a2824
line wrap: on
line diff
--- a/libmpdemux/open.c	Fri Jun 21 20:25:45 2002 +0000
+++ b/libmpdemux/open.c	Fri Jun 21 22:52:01 2002 +0000
@@ -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