mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-29 13:11:06 +00:00
Code Issues 1 Projects Releases Wiki Activity

ges: gst_bin_add() is transfer floating so wrappers around it are too

Browse source 
Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3678>
This commit is contained in:
Sebastian Dröge 2023-01-04 12:21:22 +02:00 committed by GStreamer Marge Bot
parent f45cfe0d53
commit bd534af999
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
subprojects/gst-editing-services/ges/ges-pipeline.c
View file

@ -987,7 +987,7 @@ _unlink_track (GESPipeline * self, GESTrack * track)
/** /**
* ges_pipeline_set_timeline: * ges_pipeline_set_timeline:
* @pipeline: A #GESPipeline * @pipeline: A #GESPipeline
* @timeline: (transfer full): The timeline to set for @pipeline * @timeline: (transfer floating): The timeline to set for @pipeline
* *
* Takes the given timeline and sets it as the #GESPipeline:timeline for * Takes the given timeline and sets it as the #GESPipeline:timeline for
* the pipeline. * the pipeline.

4
subprojects/gst-editing-services/ges/ges-timeline.c
View file

@ -2473,7 +2473,7 @@ ges_timeline_remove_layer (GESTimeline * timeline, GESLayer * layer)
/** /**
* ges_timeline_add_track: * ges_timeline_add_track:
* @timeline: The #GESTimeline * @timeline: The #GESTimeline
* @track: (transfer full): The track to add * @track: (transfer floating): The track to add
* *
* Add a track to the timeline. * Add a track to the timeline.
* *
@ -2510,6 +2510,8 @@ ges_timeline_add_track (GESTimeline * timeline, GESTrack * track)
if (G_UNLIKELY (g_list_find (timeline->tracks, (gconstpointer) track))) { if (G_UNLIKELY (g_list_find (timeline->tracks, (gconstpointer) track))) {
UNLOCK_DYN (timeline); UNLOCK_DYN (timeline);
GST_WARNING ("Track is already controlled by this timeline"); GST_WARNING ("Track is already controlled by this timeline");
gst_object_ref_sink (track);
gst_object_unref (track);
return FALSE; return FALSE;
} }