summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastian Dröge <sebastian.droege@collabora.co.uk>2013-04-16 16:23:46 +0200
committerSebastian Dröge <sebastian.droege@collabora.co.uk>2013-04-16 16:24:57 +0200
commit14ac66fafb2cd8ef9309c7f50c723f22f5e285d4 (patch)
treeb93476bc18c6a1a67c9c087a8513ceb6c18f9376
parent00c227f6749201774b27a9c06580064728ba4a45 (diff)
downloadgstreamer-plugins-bad-14ac66fafb2cd8ef9309c7f50c723f22f5e285d4.tar.gz
amcaudiodec: Properly set output format instead of just setting caps
-rw-r--r--sys/androidmedia/gstamcaudiodec.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/sys/androidmedia/gstamcaudiodec.c b/sys/androidmedia/gstamcaudiodec.c
index ccb0ee431..f8333e244 100644
--- a/sys/androidmedia/gstamcaudiodec.c
+++ b/sys/androidmedia/gstamcaudiodec.c
@@ -468,7 +468,6 @@ gst_amc_audio_dec_change_state (GstElement * element, GstStateChange transition)
static gboolean
gst_amc_audio_dec_set_src_caps (GstAmcAudioDec * self, GstAmcFormat * format)
{
- GstCaps *caps;
gint rate, channels;
guint32 channel_mask = 0;
GstAudioChannelPosition to[64];
@@ -503,10 +502,8 @@ gst_amc_audio_dec_set_src_caps (GstAmcAudioDec * self, GstAmcFormat * format)
gst_audio_info_set_format (&self->info, GST_AUDIO_FORMAT_S16, rate, channels,
to);
- caps = gst_audio_info_to_caps (&self->info);
-
- gst_pad_set_caps (GST_AUDIO_DECODER_SRC_PAD (self), caps);
- gst_caps_unref (caps);
+ if (!gst_audio_decoder_set_output_format (GST_AUDIO_DECODER (self), &self->info))
+ return FALSE;
self->input_caps_changed = FALSE;