diff options
Diffstat (limited to 'gst')
| -rw-r--r-- | gst/matroska/matroska-demux.c | 10 | ||||
| -rw-r--r-- | gst/udp/gstudpsink.c | 8 |
2 files changed, 2 insertions, 16 deletions
diff --git a/gst/matroska/matroska-demux.c b/gst/matroska/matroska-demux.c index 1cd39196..4e6f0e69 100644 --- a/gst/matroska/matroska-demux.c +++ b/gst/matroska/matroska-demux.c @@ -1225,7 +1225,6 @@ gst_matroska_demux_parse_index (GstMatroskaDemux *demux, if (prevent_eos) { length = gst_bytestream_length (ebml->bs); - gst_clock_set_active (demux->clock, FALSE); } while (res) { @@ -1391,10 +1390,6 @@ gst_matroska_demux_parse_index (GstMatroskaDemux *demux, } } - if (prevent_eos) { - gst_clock_set_active (demux->clock, TRUE); - } - return res; } @@ -1496,7 +1491,6 @@ gst_matroska_demux_parse_metadata (GstMatroskaDemux *demux, if (prevent_eos) { length = gst_bytestream_length (ebml->bs); - gst_clock_set_active (demux->clock, FALSE); } while (res) { @@ -1531,10 +1525,6 @@ gst_matroska_demux_parse_metadata (GstMatroskaDemux *demux, } } - if (prevent_eos) { - gst_clock_set_active (demux->clock, TRUE); - } - return res; } diff --git a/gst/udp/gstudpsink.c b/gst/udp/gstudpsink.c index 4773d291..c9a7cdc7 100644 --- a/gst/udp/gstudpsink.c +++ b/gst/udp/gstudpsink.c @@ -274,12 +274,8 @@ gst_udpsink_chain (GstPad *pad, GstData *_data) udpsink = GST_UDPSINK (GST_OBJECT_PARENT (pad)); - if (udpsink->clock) { - GstClockID id = gst_clock_new_single_shot_id (udpsink->clock, GST_BUFFER_TIMESTAMP (buf)); - - GST_DEBUG ("udpsink: clock wait: %" G_GUINT64_FORMAT "\n", GST_BUFFER_TIMESTAMP (buf)); - gst_element_clock_wait (GST_ELEMENT (udpsink), id, NULL); - gst_clock_id_free (id); + if (udpsink->clock && GST_BUFFER_TIMESTAMP_IS_VALID (buf)) { + gst_element_wait (GST_ELEMENT (udpsink), GST_BUFFER_TIMESTAMP (buf)); } tolen = sizeof(udpsink->theiraddr); |