diff --git a/ChangeLog b/ChangeLog
index 99a9e322a7..a22abcdb46 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2007-10-10  Wim Taymans  <wim.taymans@gmail.com>
+
+	Patch by: Tuomas Kulve <tuomas dot kulve at movial dot fi>
+
+	* ext/ffmpeg/gstffmpegdec.c:
+	Fix the return type of the setcaps function. Fixes #485033.
+
 2007-10-05  Wim Taymans  <wim.taymans@gmail.com>
 
 	Patch by: Yann Gilquin <yann dot gilquin at purplelabs dot com>
diff --git a/ext/ffmpeg/gstffmpegdec.c b/ext/ffmpeg/gstffmpegdec.c
index 360739dbf1..efcde44419 100644
--- a/ext/ffmpeg/gstffmpegdec.c
+++ b/ext/ffmpeg/gstffmpegdec.c
@@ -565,7 +565,7 @@ could_not_open:
   }
 }
 
-static GstPadLinkReturn
+static gboolean
 gst_ffmpegdec_setcaps (GstPad * pad, GstCaps * caps)
 {
   GstFFMpegDec *ffmpegdec;