Update for renamed aggregator pad API

https://bugzilla.gnome.org/show_bug.cgi?id=791204
This commit is contained in:
Tim-Philipp Müller 2018-01-23 09:46:32 +00:00
parent af273b4de9
commit f459438278

View file

@ -1616,7 +1616,7 @@ gst_flv_mux_find_best_pad (GstAggregator * aggregator, GstClockTime * ts)
for (l = GST_ELEMENT_CAST (aggregator)->sinkpads; l; l = l->next) { for (l = GST_ELEMENT_CAST (aggregator)->sinkpads; l; l = l->next) {
apad = GST_AGGREGATOR_PAD (l->data); apad = GST_AGGREGATOR_PAD (l->data);
pad = GST_FLV_MUX_PAD (l->data); pad = GST_FLV_MUX_PAD (l->data);
buffer = gst_aggregator_pad_get_buffer (GST_AGGREGATOR_PAD (pad)); buffer = gst_aggregator_pad_peek_buffer (GST_AGGREGATOR_PAD (pad));
if (!buffer) if (!buffer)
continue; continue;
if (best_ts == GST_CLOCK_TIME_NONE) { if (best_ts == GST_CLOCK_TIME_NONE) {
@ -1679,7 +1679,7 @@ gst_flv_mux_aggregate (GstAggregator * aggregator, gboolean timeout)
} }
if (best) { if (best) {
buffer = gst_aggregator_pad_steal_buffer (GST_AGGREGATOR_PAD (best)); buffer = gst_aggregator_pad_pop_buffer (GST_AGGREGATOR_PAD (best));
g_assert (buffer); g_assert (buffer);
best->dts = best->dts =
gst_flv_mux_segment_to_running_time (&GST_AGGREGATOR_PAD gst_flv_mux_segment_to_running_time (&GST_AGGREGATOR_PAD