From 0bf207aa533ef26b4d5bdd1abb388c3ff356ab78 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Sebastian=20Dr=C3=B6ge?= Date: Thu, 16 Aug 2018 18:03:37 +0300 Subject: [PATCH] audioaggregator: Also run the audio-specific caps fixation for audio aggregator subclasses that can't convert --- gst-libs/gst/audio/gstaudioaggregator.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/gst-libs/gst/audio/gstaudioaggregator.c b/gst-libs/gst/audio/gstaudioaggregator.c index def4389..54195bd 100644 --- a/gst-libs/gst/audio/gstaudioaggregator.c +++ b/gst-libs/gst/audio/gstaudioaggregator.c @@ -741,14 +741,10 @@ gst_audio_aggregator_update_src_caps (GstAggregator * agg, static GstCaps * gst_audio_aggregator_fixate_src_caps (GstAggregator * agg, GstCaps * caps) { - GstAudioAggregatorPad *first_configured_pad; + GstAudioAggregatorPad *first_configured_pad = NULL; - if (!GST_AUDIO_AGGREGATOR_PAD_GET_CLASS (agg->srcpad)->convert_buffer) - return - GST_AGGREGATOR_CLASS - (gst_audio_aggregator_parent_class)->fixate_src_caps (agg, caps); - - first_configured_pad = gst_audio_aggregator_get_first_configured_pad (agg); + if (GST_AUDIO_AGGREGATOR_PAD_GET_CLASS (agg->srcpad)->convert_buffer) + first_configured_pad = gst_audio_aggregator_get_first_configured_pad (agg); caps = gst_caps_make_writable (caps); -- 2.7.4