mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-18 07:47:17 +00:00
Code Issues 1 Projects Releases Wiki Activity

convertframe: fix for merge conflict

Browse source
This commit is contained in:
Wim Taymans 2011-05-24 09:55:47 +02:00
parent a87c021237
commit dfcb6580a3
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
gst-libs/gst/video/convertframe.c
View file

@ -252,7 +252,7 @@ link_failed:
*/ */
GstBuffer * GstBuffer *
gst_video_convert_frame (GstBuffer * buf, GstCaps * from_caps, 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; GstMessage *msg;
GstBuffer *result = NULL; GstBuffer *result = NULL;