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 | |
| 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')
| -rw-r--r-- | src/input/input_cdda.c | 2 | ||||
| -rw-r--r-- | src/input/input_dvd.c | 2 | ||||
| -rw-r--r-- | src/input/input_file.c | 6 | ||||
| -rw-r--r-- | src/input/input_smb.c | 4 | ||||
| -rw-r--r-- | src/input/libreal/real.c | 2 |
5 files changed, 8 insertions, 8 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 + diff --git a/src/input/input_dvd.c b/src/input/input_dvd.c index 02017956e..7eefa7b22 100644 --- a/src/input/input_dvd.c +++ b/src/input/input_dvd.c @@ -1636,7 +1636,7 @@ static input_plugin_t *dvd_class_get_instance (input_class_t *class_gen, xine_st this->mem_stack = 0; this->mem_stack_max = 1024; - this->mem = xine_xcalloc(this->mem_stack_max, sizeof(unsigned char *)); + this->mem = calloc(this->mem_stack_max, sizeof(unsigned char *)); if (!this->mem) { free(this); return NULL; diff --git a/src/input/input_file.c b/src/input/input_file.c index 2fe3925ea..aa14bad92 100644 --- a/src/input/input_file.c +++ b/src/input/input_file.c @@ -680,9 +680,9 @@ static xine_mrl_t **file_class_get_dir (input_class_t *this_gen, return NULL; } - dir_files = (xine_mrl_t *) xine_xcalloc(MAXFILES, sizeof(xine_mrl_t)); - hide_files = (xine_mrl_t *) xine_xcalloc(MAXFILES, sizeof(xine_mrl_t)); - norm_files = (xine_mrl_t *) xine_xcalloc(MAXFILES, sizeof(xine_mrl_t)); + dir_files = (xine_mrl_t *) calloc(MAXFILES, sizeof(xine_mrl_t)); + hide_files = (xine_mrl_t *) calloc(MAXFILES, sizeof(xine_mrl_t)); + norm_files = (xine_mrl_t *) calloc(MAXFILES, sizeof(xine_mrl_t)); while((pdirent = readdir(pdir)) != NULL) { diff --git a/src/input/input_smb.c b/src/input/input_smb.c index 44fa96bfd..28a225f06 100644 --- a/src/input/input_smb.c +++ b/src/input/input_smb.c @@ -245,8 +245,8 @@ static xine_mrl_t **smb_class_get_dir (input_class_t *this_gen, } if ((dir = smbc_opendir(current_path_smb)) >= 0){ - xine_mrl_t *dir_files = (xine_mrl_t *) xine_xcalloc(MAXFILES, sizeof(xine_mrl_t)); - xine_mrl_t *norm_files = (xine_mrl_t *) xine_xcalloc(MAXFILES, sizeof(xine_mrl_t)); + xine_mrl_t *dir_files = (xine_mrl_t *) calloc(MAXFILES, sizeof(xine_mrl_t)); + xine_mrl_t *norm_files = (xine_mrl_t *) calloc(MAXFILES, sizeof(xine_mrl_t)); int num_dir_files=0; int num_norm_files=0; while ((pdirent = smbc_readdir(dir)) != NULL){ diff --git a/src/input/libreal/real.c b/src/input/libreal/real.c index 078b12757..213769ff5 100644 --- a/src/input/libreal/real.c +++ b/src/input/libreal/real.c @@ -457,7 +457,7 @@ rmff_header_t *real_parse_sdp(char *data, char **stream_rules, uint32_t bandwidt desc->copyright, desc->abstract); header->data=rmff_new_dataheader(0,0); - header->streams = xine_xcalloc((desc->stream_count+1), sizeof(rmff_mdpr_t*)); + header->streams = calloc((desc->stream_count+1), sizeof(rmff_mdpr_t*)); lprintf("number of streams: %u\n", desc->stream_count); for (i=0; i<desc->stream_count; i++) { |