convertframe: fix for merge conflict

dfcb6580 · Wim Taymans · a87c0212 · dfcb6580
Commit dfcb6580 authored May 24, 2011 by Wim Taymans
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

gst-libs/gst/video/convertframe.c gst-libs/gst/video/convertframe.c +1 -1

No files found.
--- 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;