Commit e6f8f7f3 authored by Wim Taymans's avatar Wim Taymans
Browse files

video: fix header after merge

parent f9967e4a
......@@ -557,6 +557,7 @@ gboolean gst_video_event_parse_still_frame (GstEvent * event, gboolean * i
typedef void (*GstVideoConvertFrameCallback) (GstBuffer * buf, GError *error, gpointer user_data);
void gst_video_convert_frame_async (GstBuffer * buf,
GstCaps * from_caps,
const GstCaps * to_caps,
GstClockTime timeout,
GstVideoConvertFrameCallback callback,
......@@ -564,6 +565,7 @@ void gst_video_convert_frame_async (GstBuffer * buf
GDestroyNotify destroy_notify);
GstBuffer * gst_video_convert_frame (GstBuffer * buf,
GstCaps * from_caps,
const GstCaps * to_caps,
GstClockTime timeout,
GError ** error);
......
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