From 8f95bd95ccef952c60f29c54d2c6a72e8a1c5a23 Mon Sep 17 00:00:00 2001
From: Tuomas Kulve <tuomas.kulve@movial.fi>
Date: Wed, 10 Oct 2007 09:31:32 +0000
Subject: [PATCH] ext/ffmpeg/gstffmpegdec.c: Fix the return type of the setcaps
 function. Fixes #485033.

Original commit message from CVS:
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.
---
 ChangeLog                 | 7 +++++++
 ext/ffmpeg/gstffmpegdec.c | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

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;