configure.ac: reinstate libcdio CD-DA and VCD plugins (on demand)

[vlc] / modules / access / cdda / info.c

diff --git a/modules/access/cdda/info.c b/modules/access/cdda/info.c
index 4f4ba124f8b9a8df42d67dd496f5f5a0ad9568be..be214bc35e2c6db846019f2f159ca2122551679b 100644 (file)
--- a/modules/access/cdda/info.c
+++ b/modules/access/cdda/info.c
@@ -57,7 +57,7 @@ GetCDDBInfo( access_t *p_access, cdda_data_t *p_cdda )
 {
     int i, i_matches;
     cddb_conn_t  *conn = cddb_new();
-    const CdIo *p_cdio = p_cdda->p_cdio;
+    const CdIo_t *p_cdio = p_cdda->p_cdio;
 
     dbg_print( (INPUT_DBG_CALL), "" );
 
@@ -754,7 +754,7 @@ CDDAFormatMRL( const access_t *p_access, track_t i_track )
     const unsigned int psz_mrl_max = strlen(CDDA_MRL_PREFIX) 
       + strlen(p_cdda->psz_source) +
       + strlen("@T") + strlen("100") + 1;
-    char *psz_mrl = malloc( psz_mrl_max );
+    char *psz_mrl = calloc( 1, psz_mrl_max );
     
     if (CDIO_INVALID_TRACK == i_track)
       snprintf(psz_mrl, psz_mrl_max, "%s%s",