summaryrefslogtreecommitdiff
path: root/src/post/audio/upmix.c
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/post/audio/upmix.c
parent47c1651eb8c42ab6dddaff7c0663c45ac49b4fcf (diff)
parent88d23a2dbabf419ab4014b449be119a741aa54f5 (diff)
downloadxine-lib-4527fd438b39dc312c69839f051e0a2ac0046356.tar.gz
xine-lib-4527fd438b39dc312c69839f051e0a2ac0046356.tar.bz2
Merge file removal.
Diffstat (limited to 'src/post/audio/upmix.c')
-rw-r--r--src/post/audio/upmix.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/post/audio/upmix.c b/src/post/audio/upmix.c
index e1b2afbe3..725439c1f 100644
--- a/src/post/audio/upmix.c
+++ b/src/post/audio/upmix.c
@@ -181,7 +181,7 @@ static int upmix_port_open(xine_audio_port_t *port_gen, xine_stream_t *stream,
}
pthread_mutex_lock (&this->lock);
- this->sub = xine_xmalloc(sizeof(af_sub_t));
+ this->sub = calloc(1, sizeof(af_sub_t));
if (!this->sub) {
pthread_mutex_unlock (&this->lock);
return 0;
@@ -379,7 +379,7 @@ static post_plugin_t *upmix_open_plugin(post_class_t *class_gen, int inputs,
xine_audio_port_t **audio_target,
xine_video_port_t **video_target)
{
- post_plugin_upmix_t *this = (post_plugin_upmix_t *)xine_xmalloc(sizeof(post_plugin_upmix_t));
+ post_plugin_upmix_t *this = calloc(1, sizeof(post_plugin_upmix_t));
post_in_t *input;
post_out_t *output;
xine_post_in_t *input_api;