Merge from 1.2 tip.

--HG--
rename : src/combined/ffmpeg/ff_dvaudio_decoder.c => src/audio_dec/ff_dvaudio_decoder.c

4 files changed, 4 insertions, 4 deletions

diff --git a/src/post/audio/stretch.c b/src/post/audio/stretch.c
index bc079fd8d..5a0382895 100644
--- a/src/post/audio/stretch.c
+++ b/src/post/audio/stretch.c
@@ -662,7 +662,7 @@ static post_plugin_t *stretch_open_plugin(post_class_t *class_gen, int inputs,
 /* plugin class initialization function */
 void *stretch_init_plugin(xine_t *xine, void *data)
 {
-  post_class_stretch_t *class = (post_class_stretch_t *)malloc(sizeof(post_class_stretch_t));
+  post_class_stretch_t *class = (post_class_stretch_t *)xine_xmalloc(sizeof(post_class_stretch_t));
   
   if (!class)
     return NULL;
diff --git a/src/post/audio/upmix.c b/src/post/audio/upmix.c
index 30fbb452b..573354450 100644
--- a/src/post/audio/upmix.c
+++ b/src/post/audio/upmix.c
@@ -417,7 +417,7 @@ static post_plugin_t *upmix_open_plugin(post_class_t *class_gen, int inputs,
 /* plugin class initialization function */
 void *upmix_init_plugin(xine_t *xine, void *data)
 {
-  post_class_upmix_t *class = (post_class_upmix_t *)malloc(sizeof(post_class_upmix_t));
+  post_class_upmix_t *class = (post_class_upmix_t *)xine_xmalloc(sizeof(post_class_upmix_t));
   
   if (!class)
     return NULL;
diff --git a/src/post/audio/upmix_mono.c b/src/post/audio/upmix_mono.c
index 53fd23109..82ceb1877 100644
--- a/src/post/audio/upmix_mono.c
+++ b/src/post/audio/upmix_mono.c
@@ -332,7 +332,7 @@ static post_plugin_t *upmix_mono_open_plugin(post_class_t *class_gen, int inputs
 /* plugin class initialization function */
 void *upmix_mono_init_plugin(xine_t *xine, void *data)
 {
-  post_class_upmix_mono_t *class = (post_class_upmix_mono_t *)malloc(sizeof(post_class_upmix_mono_t));
+  post_class_upmix_mono_t *class = (post_class_upmix_mono_t *)xine_xmalloc(sizeof(post_class_upmix_mono_t));
   
   if (!class)
     return NULL;
diff --git a/src/post/audio/volnorm.c b/src/post/audio/volnorm.c
index 4fb2a0411..de4ebde87 100644
--- a/src/post/audio/volnorm.c
+++ b/src/post/audio/volnorm.c
@@ -450,7 +450,7 @@ static post_plugin_t *volnorm_open_plugin(post_class_t *class_gen, int inputs,
 /* plugin class initialization function */
 void *volnorm_init_plugin(xine_t *xine, void *data)
 {
-    post_class_volnorm_t *class = (post_class_volnorm_t *)malloc(sizeof(post_class_volnorm_t));
+    post_class_volnorm_t *class = (post_class_volnorm_t *)xine_xmalloc(sizeof(post_class_volnorm_t));
     
     if (!class)
         return NULL;