Mercurial > mplayer.hg

changeset 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 37fb529873d7
children 920796b6c7b1
files libmpdemux/open.c
diffstat 1 files changed, 2 insertions(+), 2 deletions(-) [+]
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