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_file.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_file.c')
| -rw-r--r-- | src/input/input_file.c | 6 |
1 files changed, 3 insertions, 3 deletions
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) { |