diff options
author | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2011-12-10 22:49:27 +0000 |
---|---|---|
committer | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2011-12-10 22:49:27 +0000 |
commit | 471aee5bb21bb5d568ac1ddaea0b35c18cda5c07 (patch) | |
tree | 77d42d4a0c337d4001d100b49b785f2604deeb0e /src/input/input_file.c | |
parent | c6324255117128d3a7a9f614c756022d3ef7461d (diff) | |
parent | 508e9088eec8f00b5dea9571383480803d4ad45e (diff) | |
download | xine-lib-471aee5bb21bb5d568ac1ddaea0b35c18cda5c07.tar.gz xine-lib-471aee5bb21bb5d568ac1ddaea0b35c18cda5c07.tar.bz2 |
Merge from 1.1.
--HG--
rename : src/liba52/xine_a52_decoder.c => src/audio_dec/xine_a52_decoder.c
rename : src/libspudvb/xine_spudvb_decoder.c => src/spu_dec/spudvb_decoder.c
rename : src/libxinevdec/image.c => src/video_dec/image.c
Diffstat (limited to 'src/input/input_file.c')
-rw-r--r-- | src/input/input_file.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/src/input/input_file.c b/src/input/input_file.c index c2ecd3c0b..796c789d6 100644 --- a/src/input/input_file.c +++ b/src/input/input_file.c @@ -841,7 +841,7 @@ static xine_mrl_t **file_class_get_dir (input_class_t *this_gen, this->mrls[num_files] = calloc(1, sizeof(xine_mrl_t)); } else - memset(this->mrls[num_files], 0, sizeof(xine_mrl_t)); + MRL_ZERO(this->mrls[num_files]); MRL_DUPLICATE(&dir_files[i], this->mrls[num_files]); @@ -859,7 +859,7 @@ static xine_mrl_t **file_class_get_dir (input_class_t *this_gen, this->mrls[num_files] = calloc(1, sizeof(xine_mrl_t)); } else - memset(this->mrls[num_files], 0, sizeof(xine_mrl_t)); + MRL_ZERO(this->mrls[num_files]); MRL_DUPLICATE(&hide_files[i], this->mrls[num_files]); @@ -877,7 +877,7 @@ static xine_mrl_t **file_class_get_dir (input_class_t *this_gen, this->mrls[num_files] = calloc(1, sizeof(xine_mrl_t)); } else - memset(this->mrls[num_files], 0, sizeof(xine_mrl_t)); + MRL_ZERO(this->mrls[num_files]); MRL_DUPLICATE(&norm_files[i], this->mrls[num_files]); @@ -945,7 +945,12 @@ static void file_class_dispose (input_class_t *this_gen) { config->unregister_callback(config, "media.files.origin_path"); + while(this->mrls_allocated_entries) { + MRL_ZERO(this->mrls[this->mrls_allocated_entries - 1]); + free(this->mrls[this->mrls_allocated_entries--]); + } free (this->mrls); + free (this); } |