Merge remote-tracking branch 'origin/master' into 0.11

[platform/upstream/gstreamer.git] / gst / playback / gstplaysinkconvertbin.c

diff --git a/gst/playback/gstplaysinkconvertbin.c b/gst/playback/gstplaysinkconvertbin.c
index d5479e6..38a3476 100644 (file)
--- a/gst/playback/gstplaysinkconvertbin.c
+++ b/gst/playback/gstplaysinkconvertbin.c
@@ -398,7 +398,7 @@ gst_play_sink_convert_bin_getcaps (GstPad * pad, GstCaps * filter)
     if (peer) {
       GstCaps *peer_caps = gst_pad_query_caps (peer, filter);
       gst_object_unref (peer);
-      if (self->converter_caps) {
+      if (self->converter_caps && is_raw_caps (peer_caps, self->audio)) {
         peer_caps = gst_caps_make_writable (peer_caps);
         gst_caps_merge (peer_caps, gst_caps_ref (self->converter_caps));
         ret = peer_caps;