diff options
| author | Wim Taymans <wtaymans@redhat.com> | 2015-02-03 17:35:52 +0100 |
|---|---|---|
| committer | Wim Taymans <wtaymans@redhat.com> | 2015-02-03 17:39:10 +0100 |
| commit | 852c040c89bd99bd11598a628934a2b48b1e9a64 (patch) | |
| tree | 5caf21c15fae59392fee345b9cb5f7f71a76fd93 | |
| parent | 7772a25fdccd92f39a8409cbac5ebd0cc96712bf (diff) | |
rtspsrc: fix container handling
We detect a container correctly now so we need to revert the weird
check there was before.
Use gst_rtspsrc_stream_push_event() to push the caps event on the
right pad.
See https://bugzilla.gnome.org/show_bug.cgi?id=739391
| -rw-r--r-- | gst/rtsp/gstrtspsrc.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/gst/rtsp/gstrtspsrc.c b/gst/rtsp/gstrtspsrc.c index 20677eb15..24d9b8199 100644 --- a/gst/rtsp/gstrtspsrc.c +++ b/gst/rtsp/gstrtspsrc.c @@ -3297,7 +3297,7 @@ gst_rtspsrc_stream_configure_manager (GstRTSPSrc * src, GstRTSPStream * stream, * so slaving in jitterbuffer does not make much sense * (and might mess things up due to bursts) */ if (GST_CLOCK_TIME_IS_VALID (src->segment.duration) && - src->segment.duration && !stream->container) { + src->segment.duration && stream->container) { src->use_buffering = TRUE; } else { src->use_buffering = FALSE; @@ -4583,8 +4583,7 @@ gst_rtspsrc_handle_data (GstRTSPSrc * src, GstRTSPMessage * message) gst_rtspsrc_stream_push_event (src, ostream, event); if ((caps = stream_get_caps_for_pt (ostream, ostream->default_pt))) { - gst_pad_push_event (ostream->channelpad[0], gst_event_new_caps (caps)); - gst_caps_unref (caps); + gst_rtspsrc_stream_push_event (src, ostream, gst_event_new_caps (caps)); } } g_checksum_free (cs); @@ -6483,7 +6482,7 @@ gst_rtspsrc_setup_streams (GstRTSPSrc * src, gboolean async) break; } - if (!stream->container || (!src->interleaved && !retry)) { + if (stream->container || (!src->interleaved && !retry)) { /* now configure the stream with the selected transport */ if (!gst_rtspsrc_stream_configure_transport (stream, &transport)) { GST_DEBUG_OBJECT (src, |