From dfcb6580a3b0ab4639feeab3e85326e7907d3805 Mon Sep 17 00:00:00 2001
From: Wim Taymans <wim.taymans@collabora.co.uk>
Date: Tue, 24 May 2011 09:55:47 +0200
Subject: [PATCH] convertframe: fix for merge conflict

---
 gst-libs/gst/video/convertframe.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gst-libs/gst/video/convertframe.c b/gst-libs/gst/video/convertframe.c
index 3d71675f52..5825de2de7 100644
--- a/gst-libs/gst/video/convertframe.c
+++ b/gst-libs/gst/video/convertframe.c
@@ -252,7 +252,7 @@ link_failed:
  */
 GstBuffer *
 gst_video_convert_frame (GstBuffer * buf, GstCaps * from_caps,
-    const GstCaps * to_caps, GstClockTime timeout, GError ** err)
+    const GstCaps * to_caps, GstClockTime timeout, GError ** error)
 {
   GstMessage *msg;
   GstBuffer *result = NULL;