Merge from 1.1.

--HG--
rename : src/libfaad/xine_faad_decoder.c => src/audio_dec/xine_faad_decoder.c

4 files changed, 19 insertions, 12 deletions

diff --git a/ChangeLog b/ChangeLog
index aa34541c8..105e30d0d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -82,18 +82,20 @@ xine-lib (1.2.0) 2012-01-01
   * Report more video output capabilities via (port)->get_capabilities():
     colour controls, zooming, colour keying.
 
-xine-lib (1.1.21) ????-??-??
-  * mpeg-ts fixes and enhancements
+xine-lib (1.1.21) 2012-06-09
+  * Fix a potential double-free (goom) when playing AAC files.
+  * Fix a possible clean-up crash in the goom FFT code.
+  * Fix matroska header compression.
+  * MPEG-TS fixes and enhancements
   * Improved syncing of DVB subtitles
   * BluRay support (requires libbluray)
   * Fix full range YUV (with ffmpeg codecs)
   * Fix multithreading with recent ffmpeg versions
   * Fix cropping with ffmpeg codecs
   * Fix OSD when using OpenGL video output
-
-xine-lib (1.1.20.2) ????-??-??
+  * xine-list no longer causes catalog.cache to be written.
+  * Windows-related (cygwin, mingw) build fixes.
   * Various bug fixes.
-  * Fix matroska header compression.
 
 xine-lib (1.1.20.1) 2012-01-01
   * Various bug fixes.
diff --git a/src/audio_dec/xine_faad_decoder.c b/src/audio_dec/xine_faad_decoder.c
index be495ee8f..f9eedb6e8 100644
--- a/src/audio_dec/xine_faad_decoder.c
+++ b/src/audio_dec/xine_faad_decoder.c
@@ -250,8 +250,10 @@ static void faad_decode_audio ( faad_decoder_t *this, int end_frame ) {
         lprintf("NeAACDecDecode() returned rate=%"PRId32" channels=%d used=%d\n",
                 this->rate, this->num_channels, used);
 
-        this->stream->audio_out->close (this->stream->audio_out, this->stream);
-        this->output_open = 0;
+        if (this->output_open) {
+          this->stream->audio_out->close (this->stream->audio_out, this->stream);
+          this->output_open = 0;
+        }
         faad_open_output( this );
 
         faad_meta_info_set( this );
diff --git a/src/demuxers/demux_aac.c b/src/demuxers/demux_aac.c
index bc2e72f73..2e1b7f614 100644
--- a/src/demuxers/demux_aac.c
+++ b/src/demuxers/demux_aac.c
@@ -91,7 +91,7 @@ static int open_aac_file(demux_aac_t *this) {
     return 0;
 
   /* Check for an ADIF header - should be at the start of the file */
-  if (_x_is_fourcc(peak, "AIDF")) {
+  if (_x_is_fourcc(peak, "ADIF")) {
     lprintf("found ADIF header\n");
     return 1;
   }
diff --git a/src/post/visualizations/fft.c b/src/post/visualizations/fft.c
index 8e9364400..0b61625c3 100644
--- a/src/post/visualizations/fft.c
+++ b/src/post/visualizations/fft.c
@@ -153,10 +153,13 @@ fft_t *fft_new (int bits)
 
 void fft_dispose(fft_t *fft)
 {
-  free(fft->SineTable);
-  free(fft->CosineTable);
-  free(fft->WinTable);
-  free(fft);
+  if (fft)
+  {
+    free(fft->SineTable);
+    free(fft->CosineTable);
+    free(fft->WinTable);
+    free(fft);
+  }
 }
 
 /*