1 files changed, 9 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index 1317a1a78e..233e98f8de 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2006-03-22  Wim Taymans  <wim@fluendo.com>
+
+	* ext/ffmpeg/gstffmpegdec.c: (gst_ffmpegdec_close),
+	(gst_ffmpegdec_setcaps), (gst_ffmpegdec_change_state):
+	make _open and _close as functions that should be
+	called with the object lock instead of them taking a
+	lock themselves. This fixes a deadlock when 
+	_open fails.
+
 2006-03-14  Tim-Philipp Müller  <tim at centricular dot net>
 
 	* ext/ffmpeg/gstffmpegdec.c: (gst_ffmpegdec_frame):