diff options
| author | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2008-04-21 00:05:16 +0100 |
|---|---|---|
| committer | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2008-04-21 00:05:16 +0100 |
| commit | b726e1b4ef9beaf6ba5a8ae15f15a9f818e48a3b (patch) | |
| tree | 8fd56bdda807c35dcf5cd0bbe88bd151158f24d7 /src/input/input_cdda.c | |
| parent | 9a34a9096f156d46176cf30270e38a32410cd116 (diff) | |
| parent | d59c3de535738d8cd5d313b5a4f5502fa0aa7081 (diff) | |
| download | xine-lib-b726e1b4ef9beaf6ba5a8ae15f15a9f818e48a3b.tar.gz xine-lib-b726e1b4ef9beaf6ba5a8ae15f15a9f818e48a3b.tar.bz2 | |
Merge from 1.1.
--HG--
rename : src/demuxers/demux_nsf.c => src/combined/nsf_demuxer.c
rename : src/libxinevdec/bitplane.c => src/video_dec/bitplane.c
Diffstat (limited to 'src/input/input_cdda.c')
| -rw-r--r-- | src/input/input_cdda.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/input/input_cdda.c b/src/input/input_cdda.c index 64495c433..70f8a55c0 100644 --- a/src/input/input_cdda.c +++ b/src/input/input_cdda.c @@ -2414,7 +2414,7 @@ static int cdda_plugin_open (input_plugin_t *this_gen ) { if(this->cddb.num_tracks) { int t; - this->cddb.track = (trackinfo_t *) xine_xcalloc(this->cddb.num_tracks, sizeof(trackinfo_t)); + this->cddb.track = (trackinfo_t *) calloc(this->cddb.num_tracks, sizeof(trackinfo_t)); for(t = 0; t < this->cddb.num_tracks; t++) { int length = (toc->toc_entries[t].first_frame_minute * CD_SECONDS_PER_MINUTE + |