From 9fc6c93c8b10b28aa810e6b242af96074acd37a4 Mon Sep 17 00:00:00 2001 From: albeu Date: Fri, 21 Jun 2002 22:52:01 +0000 Subject: [PATCH] filename can be NULL. Fix the conflict between cdda and dvdnav. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@6491 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libmpdemux/open.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libmpdemux/open.c b/libmpdemux/open.c index 5fa7a316b2..a57861991f 100644 --- a/libmpdemux/open.c +++ b/libmpdemux/open.c @@ -86,9 +86,9 @@ int bsize = VCD_SECTOR_SIZE; #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