diff options
| author | Tim-Philipp Müller <tim@centricular.com> | 2018-01-23 09:01:00 +0000 |
|---|---|---|
| committer | Tim-Philipp Müller <tim@centricular.com> | 2018-01-23 09:01:00 +0000 |
| commit | c7e34a0b2fda550c3b14d3945bfd3398c94df968 (patch) | |
| tree | 3efc56307c1b48e6738c9fd02af82f8e4aee49d5 /gst-libs | |
| parent | cfe030ad1b873ece6087283e8e4e21519224c7e4 (diff) | |
Update for renamed aggregator pad API
https://bugzilla.gnome.org/show_bug.cgi?id=791204
Diffstat (limited to 'gst-libs')
| -rw-r--r-- | gst-libs/gst/audio/gstaudioaggregator.c | 2 | ||||
| -rw-r--r-- | gst-libs/gst/video/gstvideoaggregator.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/gst-libs/gst/audio/gstaudioaggregator.c b/gst-libs/gst/audio/gstaudioaggregator.c index d749b9b7c..fa9911b31 100644 --- a/gst-libs/gst/audio/gstaudioaggregator.c +++ b/gst-libs/gst/audio/gstaudioaggregator.c @@ -1780,7 +1780,7 @@ gst_audio_aggregator_aggregate (GstAggregator * agg, gboolean timeout) if (!pad_eos) is_eos = FALSE; - pad->priv->input_buffer = gst_aggregator_pad_get_buffer (aggpad); + pad->priv->input_buffer = gst_aggregator_pad_peek_buffer (aggpad); GST_OBJECT_LOCK (pad); if (!pad->priv->input_buffer) { diff --git a/gst-libs/gst/video/gstvideoaggregator.c b/gst-libs/gst/video/gstvideoaggregator.c index 00e02768f..a0c23b746 100644 --- a/gst-libs/gst/video/gstvideoaggregator.c +++ b/gst-libs/gst/video/gstvideoaggregator.c @@ -1077,7 +1077,7 @@ gst_video_aggregator_fill_queues (GstVideoAggregator * vagg, if (!is_eos) eos = FALSE; - buf = gst_aggregator_pad_get_buffer (bpad); + buf = gst_aggregator_pad_peek_buffer (bpad); if (buf) { GstClockTime start_time, end_time; @@ -1122,7 +1122,7 @@ gst_video_aggregator_fill_queues (GstVideoAggregator * vagg, continue; } gst_buffer_unref (buf); - buf = gst_aggregator_pad_steal_buffer (bpad); + buf = gst_aggregator_pad_pop_buffer (bpad); gst_buffer_replace (&pad->buffer, buf); if (pad->priv->pending_vinfo.finfo) { pad->info = pad->priv->pending_vinfo; |