Commit dfcb6580 authored by Wim Taymans's avatar Wim Taymans

convertframe: fix for merge conflict

parent a87c0212
......@@ -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;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment