summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastian Dröge <sebastian@centricular.com>2018-08-16 18:03:37 +0300
committerSebastian Dröge <sebastian@centricular.com>2018-08-17 09:48:12 +0300
commit94d86a58f78decbb1caa4d2aed17809a18f7b22c (patch)
tree12ebc0a51f525f27afa63000af55d7ae7cb8f215
parent92310f7d5bdf7ac10b5c7b049d0c27e8b168bf18 (diff)
downloadgstreamer-plugins-base-94d86a58f78decbb1caa4d2aed17809a18f7b22c.tar.gz
audioaggregator: Also run the audio-specific caps fixation for audio aggregator subclasses that can't convert
-rw-r--r--gst-libs/gst/audio/gstaudioaggregator.c10
1 files changed, 3 insertions, 7 deletions
diff --git a/gst-libs/gst/audio/gstaudioaggregator.c b/gst-libs/gst/audio/gstaudioaggregator.c
index ab42b73d7..f3e84741c 100644
--- a/gst-libs/gst/audio/gstaudioaggregator.c
+++ b/gst-libs/gst/audio/gstaudioaggregator.c
@@ -774,14 +774,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);