Mercurial > mplayer.hg

comparison 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
comparison
equal deleted inserted replaced
6489:37fb529873d7 6490:d7605d08b32f
84 #ifdef __FreeBSD__ 84 #ifdef __FreeBSD__
85 int bsize = VCD_SECTOR_SIZE; 85 int bsize = VCD_SECTOR_SIZE;
86 #endif 86 #endif
87 87
88 #ifdef HAVE_CDDA 88 #ifdef HAVE_CDDA
89 if(strncmp("cdda://",filename,7) == 0) 89 if(filename && strncmp("cdda://",filename,7) == 0)
90 return open_cdda(cdrom_device ? cdrom_device : DEFAULT_CDROM_DEVICE,filename+7); 90 return open_cdda(cdrom_device ? cdrom_device : DEFAULT_CDROM_DEVICE,filename+7);
91 if(strncmp("cddb://",filename,7) == 0) 91 if(filename && strncmp("cddb://",filename,7) == 0)
92 return cddb_open(cdrom_device ? cdrom_device : DEFAULT_CDROM_DEVICE,filename+7); 92 return cddb_open(cdrom_device ? cdrom_device : DEFAULT_CDROM_DEVICE,filename+7);
93 #endif 93 #endif
94 94
95 //============ Open VideoCD track ============== 95 //============ Open VideoCD track ==============
96 #ifdef HAVE_VCD 96 #ifdef HAVE_VCD