mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-28 11:10:37 +00:00
Code Issues 1 Projects Releases Wiki Activity

badvideo: Rename videoconvert functions to prevent conflicts with static linking

Browse source 
https://bugzilla.gnome.org/show_bug.cgi?id=728443
This commit is contained in:
Sebastian Dröge 2014-06-28 17:01:52 +02:00
parent 5d0564eb4e
commit 97cf5acb20
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
gst-libs/gst/video/gstvideoaggregator.c
View file

@ -139,7 +139,7 @@ gst_videoaggregator_pad_finalize (GObject * o)
GstVideoAggregatorPad *vaggpad = GST_VIDEO_AGGREGATOR_PAD (o); GstVideoAggregatorPad *vaggpad = GST_VIDEO_AGGREGATOR_PAD (o);
if (vaggpad->priv->convert) if (vaggpad->priv->convert)
videoconvert_convert_free (vaggpad->priv->convert); badvideoconvert_convert_free (vaggpad->priv->convert);
vaggpad->priv->convert = NULL; vaggpad->priv->convert = NULL;
G_OBJECT_CLASS (gst_videoaggregator_pad_parent_class)->finalize (o); G_OBJECT_CLASS (gst_videoaggregator_pad_parent_class)->finalize (o);
@ -433,7 +433,7 @@ gst_videoaggregator_update_converters (GstVideoAggregator * vagg)
continue; continue;
if (pad->priv->convert) if (pad->priv->convert)
videoconvert_convert_free (pad->priv->convert); badvideoconvert_convert_free (pad->priv->convert);
pad->priv->convert = NULL; pad->priv->convert = NULL;
@ -446,7 +446,7 @@ gst_videoaggregator_update_converters (GstVideoAggregator * vagg)
GST_DEBUG_OBJECT (pad, "This pad will be converted from %d to %d", GST_DEBUG_OBJECT (pad, "This pad will be converted from %d to %d",
GST_VIDEO_INFO_FORMAT (&pad->info), GST_VIDEO_INFO_FORMAT (&pad->info),
GST_VIDEO_INFO_FORMAT (&best_info)); GST_VIDEO_INFO_FORMAT (&best_info));
pad->priv->convert = videoconvert_convert_new (&pad->info, &best_info); pad->priv->convert = badvideoconvert_convert_new (&pad->info, &best_info);
pad->need_conversion_update = TRUE; pad->need_conversion_update = TRUE;
if (!pad->priv->convert) { if (!pad->priv->convert) {
g_free (colorimetry); g_free (colorimetry);
@ -1059,7 +1059,8 @@ prepare_frames (GstVideoAggregator * vagg, GstVideoAggregatorPad * pad)
return FALSE; return FALSE;
} }
videoconvert_convert_convert (pad->priv->convert, converted_frame, frame); badvideoconvert_convert_convert (pad->priv->convert, converted_frame,
frame);
pad->converted_buffer = converted_buf; pad->converted_buffer = converted_buf;
gst_video_frame_unmap (frame); gst_video_frame_unmap (frame);
} else { } else {