diff --git a/ChangeLog b/ChangeLog
index fb70ba49e2..44a3fd358e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-06-08  Luca Ognibene  <luogni@tin.it>
+
+	* ext/ffmpeg/gstffmpegdec.c (gst_ffmpegdec_change_state): 
+	  First close the ffmpeg context than try to free last_buffer.
+	  fix #306893
+
 2005-06-03  Ronald S. Bultje  <rbultje@ronald.bitfreak.net>
 
 	* ext/ffmpeg/gstffmpegdec.c: (gst_ffmpegdec_open),
diff --git a/common b/common
index 67b7e6c0db..495d6e30b3 160000
--- a/common
+++ b/common
@@ -1 +1 @@
-Subproject commit 67b7e6c0db99415e0440d0c576495641b53e976a
+Subproject commit 495d6e30b3e513aebbc98467707c609c49ea654d
diff --git a/ext/ffmpeg/gstffmpegdec.c b/ext/ffmpeg/gstffmpegdec.c
index 8b513be709..3b9a13724f 100644
--- a/ext/ffmpeg/gstffmpegdec.c
+++ b/ext/ffmpeg/gstffmpegdec.c
@@ -1002,10 +1002,10 @@ gst_ffmpegdec_change_state (GstElement * element)
 
   switch (transition) {
     case GST_STATE_PAUSED_TO_READY:
+      gst_ffmpegdec_close (ffmpegdec);
       if (ffmpegdec->last_buffer != NULL) {
 	gst_buffer_unref (ffmpegdec->last_buffer);
       }
-      gst_ffmpegdec_close (ffmpegdec);
       break;
   }