diff options
| author | Wim Taymans <wim.taymans@gmail.com> | 2006-08-16 09:48:26 +0000 |
|---|---|---|
| committer | Wim Taymans <wim.taymans@gmail.com> | 2006-08-16 09:48:26 +0000 |
| commit | 6eedcfbc8c493079db829b5f67ccd1bd791c1313 (patch) | |
| tree | 698ae29c418336a8acc2ed4c8262690e9eb75510 /gst/rtsp/gstrtpdec.c | |
| parent | 64faced49c74be6cfb7c8b215e7e782dec6ed5ee (diff) | |
gst/rtsp/gstrtpdec.c: Add pads after setting them up.
Original commit message from CVS:
* gst/rtsp/gstrtpdec.c: (gst_rtpdec_init), (gst_rtpdec_getcaps):
Add pads after setting them up.
* gst/rtsp/gstrtspsrc.c: (gst_rtspsrc_class_init),
(gst_rtspsrc_init), (gst_rtspsrc_finalize),
(gst_rtspsrc_free_stream), (gst_rtspsrc_media_to_caps),
(gst_rtspsrc_stream_setup_rtp),
(gst_rtspsrc_stream_configure_transport),
(gst_rtspsrc_combine_flows), (gst_rtspsrc_loop),
(gst_rtspsrc_open), (gst_rtspsrc_close), (gst_rtspsrc_play),
(gst_rtspsrc_pause):
* gst/rtsp/gstrtspsrc.h:
Fix interleaved mode.
- Protect streaming with lock.
- Combine flows
- set caps on outgoing buffers.
- strip trailing \0 from data packets.
- Configure RTP/RTCP in stream.
Use DEBUG_OBJECT more.
Diffstat (limited to 'gst/rtsp/gstrtpdec.c')
| -rw-r--r-- | gst/rtsp/gstrtpdec.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/gst/rtsp/gstrtpdec.c b/gst/rtsp/gstrtpdec.c index 24054d83..a8d6dddd 100644 --- a/gst/rtsp/gstrtpdec.c +++ b/gst/rtsp/gstrtpdec.c @@ -170,16 +170,16 @@ gst_rtpdec_init (GstRTPDec * rtpdec) rtpdec->sink_rtp = gst_pad_new_from_static_template (&gst_rtpdec_sink_rtp_template, "sinkrtp"); - gst_element_add_pad (GST_ELEMENT (rtpdec), rtpdec->sink_rtp); gst_pad_set_getcaps_function (rtpdec->sink_rtp, gst_rtpdec_getcaps); gst_pad_set_chain_function (rtpdec->sink_rtp, gst_rtpdec_chain_rtp); + gst_element_add_pad (GST_ELEMENT (rtpdec), rtpdec->sink_rtp); /* the input rtcp pad */ rtpdec->sink_rtcp = gst_pad_new_from_static_template (&gst_rtpdec_sink_rtcp_template, "sinkrtcp"); - gst_element_add_pad (GST_ELEMENT (rtpdec), rtpdec->sink_rtcp); gst_pad_set_chain_function (rtpdec->sink_rtcp, gst_rtpdec_chain_rtcp); + gst_element_add_pad (GST_ELEMENT (rtpdec), rtpdec->sink_rtcp); /* the output rtp pad */ rtpdec->src_rtp = @@ -203,7 +203,7 @@ gst_rtpdec_getcaps (GstPad * pad) src = GST_RTPDEC (GST_PAD_PARENT (pad)); - other = pad == src->src_rtp ? src->sink_rtp : src->src_rtp; + other = (pad == src->src_rtp ? src->sink_rtp : src->src_rtp); caps = gst_pad_peer_get_caps (other); |