summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Schleef <ds@schleef.org>2003-12-31 08:41:48 +0000
committerDavid Schleef <ds@schleef.org>2003-12-31 08:41:48 +0000
commit079a91cc80e601dfb26f6efba16a11fcaf8d0e4d (patch)
tree75ffce0a897f2e33a45353542264e8e2013da838
parent7bbd7da5022719d6ad23961e6612f3b383586b19 (diff)
Change gst_pad_proxy_link() to gst_pad_try_set_caps()
Original commit message from CVS: Change gst_pad_proxy_link() to gst_pad_try_set_caps()
-rw-r--r--ChangeLog6
-rw-r--r--gst/udp/gstudpsrc.c2
2 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 61812f97..7d2996e5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2003-12-31 David Schleef <ds@schleef.org>
+
+ * gst/tcp/gsttcpsrc.c: (gst_tcpsrc_get):
+ * gst/udp/gstudpsrc.c: (gst_udpsrc_get):
+ Change gst_pad_proxy_link() to gst_pad_try_set_caps()
+
2003-12-30 David Schleef <ds@schleef.org>
* ext/ffmpeg/gstffmpegcolorspace.c:
diff --git a/gst/udp/gstudpsrc.c b/gst/udp/gstudpsrc.c
index ce6362ec..07d447ce 100644
--- a/gst/udp/gstudpsrc.c
+++ b/gst/udp/gstudpsrc.c
@@ -236,7 +236,7 @@ gst_udpsrc_get (GstPad *pad)
caps = gst_caps_load_thyself(doc->xmlRootNode);
/* foward the connect, we don't signal back the result here... */
- gst_pad_proxy_link (udpsrc->srcpad, caps);
+ gst_pad_try_set_caps (udpsrc->srcpad, caps);
#endif
g_free (buf);