# HG changeset patch # User albeu # Date 1024699921 0 # Node ID d7605d08b32fff427b5a0abed19a4acf97485959 # Parent 37fb529873d74c0de0af2d1443909a604dfb6921 filename can be NULL. Fix the conflict between cdda and dvdnav. diff -r 37fb529873d7 -r d7605d08b32f libmpdemux/open.c --- 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