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

compile before checkin

Browse source 
Original commit message from CVS:
compile before checkin
This commit is contained in:
Benjamin Otte 2004-02-05 23:51:34 +00:00
parent f3c9c3493d
commit 350d4a897c
1 changed files with 0 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
gst/gstelement.c
View file

@ -1145,12 +1145,9 @@ gst_element_remove_pad (GstElement *element, GstPad *pad)
if (GST_RPAD_PEER (pad) != NULL) { if (GST_RPAD_PEER (pad) != NULL) {
gst_pad_unlink (pad, GST_PAD (GST_RPAD_PEER (pad))); gst_pad_unlink (pad, GST_PAD (GST_RPAD_PEER (pad)));
} }
<<<<<<< gstelement.c
gst_caps_replace (&GST_RPAD_EXPLICIT_CAPS (pad), NULL); gst_caps_replace (&GST_RPAD_EXPLICIT_CAPS (pad), NULL);
=======
} else if (GST_IS_GHOST_PAD (pad)) { } else if (GST_IS_GHOST_PAD (pad)) {
g_object_set (pad, "real-pad", NULL, NULL); g_object_set (pad, "real-pad", NULL, NULL);
>>>>>>> 1.250
} }
/* remove it from the list */ /* remove it from the list */