Merge from 1.2 tip.

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

6 files changed, 4 insertions, 17 deletions

diff --git a/src/post/visualizations/fft.c b/src/post/visualizations/fft.c
index e9a99911a..01044987b 100644
--- a/src/post/visualizations/fft.c
+++ b/src/post/visualizations/fft.c
@@ -184,18 +184,6 @@ double fft_amp (int n, complex_t wave[], int bits)
 }
 
 /*
- *  Calculate phase of component n in the decimated wave[] array.
- */
-double fft_phase (int n, complex_t wave[], int bits)
-{
-  n = PERMUTE (n, bits);
-  if (REAL(n) != 0.0)
-    return (atan (IMAG(n) / REAL(n)));
-  else
-    return (0.0);
-}
-
-/*
  *  Scale sampled values.
  *  Do this *before* the fft.
  */
diff --git a/src/post/visualizations/fft.h b/src/post/visualizations/fft.h
index dff3cd7e8..1600430bc 100644
--- a/src/post/visualizations/fft.h
+++ b/src/post/visualizations/fft.h
@@ -44,7 +44,6 @@ void    fft_compute (fft_t *fft, complex_t wave[]);
 void    fft_window (fft_t *fft, complex_t wave[]);
 
 double  fft_amp (int n, complex_t wave[], int bits);
-double  fft_phase (int n, complex_t wave[], int bits);
 void    fft_scale (complex_t wave[], int bits);
 
 #endif /* FFT_H */
diff --git a/src/post/visualizations/fftgraph.c b/src/post/visualizations/fftgraph.c
index c31c529f2..39d17c730 100644
--- a/src/post/visualizations/fftgraph.c
+++ b/src/post/visualizations/fftgraph.c
@@ -455,7 +455,7 @@ static post_plugin_t *fftgraph_open_plugin(post_class_t *class_gen, int inputs,
 /* plugin class initialization function */
 void *fftgraph_init_plugin(xine_t *xine, void *data)
 {
-  post_class_fftgraph_t *class = (post_class_fftgraph_t *)malloc(sizeof(post_class_fftgraph_t));
+  post_class_fftgraph_t *class = (post_class_fftgraph_t *)xine_xmalloc(sizeof(post_class_fftgraph_t));
   
   if (!class)
     return NULL;
diff --git a/src/post/visualizations/fftscope.c b/src/post/visualizations/fftscope.c
index dd474bd6f..1a9ea905a 100644
--- a/src/post/visualizations/fftscope.c
+++ b/src/post/visualizations/fftscope.c
@@ -476,7 +476,7 @@ static post_plugin_t *fftscope_open_plugin(post_class_t *class_gen, int inputs,
 /* plugin class initialization function */
 void *fftscope_init_plugin(xine_t *xine, void *data)
 {
-  post_class_fftscope_t *class = (post_class_fftscope_t *)malloc(sizeof(post_class_fftscope_t));
+  post_class_fftscope_t *class = (post_class_fftscope_t *)xine_xmalloc(sizeof(post_class_fftscope_t));
   
   if (!class)
     return NULL;
diff --git a/src/post/visualizations/fooviz.c b/src/post/visualizations/fooviz.c
index 2cf77cadc..3e5702168 100644
--- a/src/post/visualizations/fooviz.c
+++ b/src/post/visualizations/fooviz.c
@@ -287,7 +287,7 @@ static post_plugin_t *fooviz_open_plugin(post_class_t *class_gen, int inputs,
 /* plugin class initialization function */
 static void *fooviz_init_plugin(xine_t *xine, void *data)
 {
-  post_class_fooviz_t *class = (post_class_fooviz_t *)malloc(sizeof(post_class_fooviz_t));
+  post_class_fooviz_t *class = (post_class_fooviz_t *)xine_xmalloc(sizeof(post_class_fooviz_t));
   
   if (!class)
     return NULL;
diff --git a/src/post/visualizations/oscope.c b/src/post/visualizations/oscope.c
index 1d498980a..7c9faeeaa 100644
--- a/src/post/visualizations/oscope.c
+++ b/src/post/visualizations/oscope.c
@@ -358,7 +358,7 @@ static post_plugin_t *oscope_open_plugin(post_class_t *class_gen, int inputs,
 /* plugin class initialization function */
 void *oscope_init_plugin(xine_t *xine, void *data)
 {
-  post_class_oscope_t *class = (post_class_oscope_t *)malloc(sizeof(post_class_oscope_t));
+  post_class_oscope_t *class = (post_class_oscope_t *)xine_xmalloc(sizeof(post_class_oscope_t));
   
   if (!class)
     return NULL;