summaryrefslogtreecommitdiff
path: root/src/libspucmml
diff options
context:
space:
mode:
authorDiego 'Flameeyes' Pettenò <flameeyes@gmail.com>2008-05-07 17:11:22 +0200
committerDiego 'Flameeyes' Pettenò <flameeyes@gmail.com>2008-05-07 17:11:22 +0200
commit4527fd438b39dc312c69839f051e0a2ac0046356 (patch)
treed3b2dc1f89617e86c619575e3324534c523ed673 /src/libspucmml
parent47c1651eb8c42ab6dddaff7c0663c45ac49b4fcf (diff)
parent88d23a2dbabf419ab4014b449be119a741aa54f5 (diff)
downloadxine-lib-4527fd438b39dc312c69839f051e0a2ac0046356.tar.gz
xine-lib-4527fd438b39dc312c69839f051e0a2ac0046356.tar.bz2
Merge file removal.
Diffstat (limited to 'src/libspucmml')
-rw-r--r--src/libspucmml/xine_cmml_decoder.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libspucmml/xine_cmml_decoder.c b/src/libspucmml/xine_cmml_decoder.c
index b684d21cb..90a0ca64a 100644
--- a/src/libspucmml/xine_cmml_decoder.c
+++ b/src/libspucmml/xine_cmml_decoder.c
@@ -450,7 +450,7 @@ static spu_decoder_t *spucmml_class_open_plugin (spu_decoder_class_t *class_gen,
spucmml_class_t *class = (spucmml_class_t *)class_gen;
spucmml_decoder_t *this ;
- this = (spucmml_decoder_t *) xine_xmalloc (sizeof (spucmml_decoder_t));
+ this = (spucmml_decoder_t *) calloc(1, sizeof(spucmml_decoder_t));
this->spu_decoder.decode_data = spudec_decode_data;
this->spu_decoder.reset = spudec_reset;
@@ -514,7 +514,7 @@ static void *init_spu_decoder_plugin (xine_t *xine, void *data) {
spucmml_class_t *this ;
- this = (spucmml_class_t *) xine_xmalloc (sizeof (spucmml_class_t));
+ this = (spucmml_class_t *) calloc(1, sizeof(spucmml_class_t));
this->class.open_plugin = spucmml_class_open_plugin;
this->class.get_identifier = spucmml_class_get_identifier;