Memory access fixes:

 - goom initialization
 - matroska playing recent files with AAC
 - replace free() by ffmpeg's av_free() in ff decoders

2 files changed, 5 insertions, 5 deletions

diff --git a/src/combined/ffmpeg/ff_audio_decoder.c b/src/combined/ffmpeg/ff_audio_decoder.c
index c2e3740e3..e0d294113 100644
--- a/src/combined/ffmpeg/ff_audio_decoder.c
+++ b/src/combined/ffmpeg/ff_audio_decoder.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2001-2005 the xine project
+ * Copyright (C) 2001-2008 the xine project
  * 
  * This file is part of xine, a free video player.
  * 
@@ -443,7 +443,7 @@ static void ff_audio_dispose (audio_decoder_t *this_gen) {
     free(this->context->extradata);
 
   if(this->context)
-    free(this->context);
+    av_free(this->context);
 
   free (this_gen);
 }
diff --git a/src/combined/ffmpeg/ff_video_decoder.c b/src/combined/ffmpeg/ff_video_decoder.c
index ac101d77e..a04d2feb6 100644
--- a/src/combined/ffmpeg/ff_video_decoder.c
+++ b/src/combined/ffmpeg/ff_video_decoder.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2001-2007 the xine project
+ * Copyright (C) 2001-2008 the xine project
  * 
  * This file is part of xine, a free video player.
  * 
@@ -1530,10 +1530,10 @@ static void ff_dispose (video_decoder_t *this_gen) {
     free_yuv_planes(&this->yuv);
   
   if( this->context )
-    free( this->context );
+    av_free( this->context );
 
   if( this->av_frame )
-    free( this->av_frame );
+    av_free( this->av_frame );
   
   if (this->buf)
     free(this->buf);