convertframe: fix for merge conflict

diff --git a/gst-libs/gst/video/convertframe.c b/gst-libs/gst/video/convertframe.c
index 3d71675..5825de2 100644 (file)
--- 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;