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

Conflicts:
	gst-libs/gst/fft/gstffts16.h

diff --cc gst-libs/gst/fft/gstfftf32.h
index fcd3174,2d634f8..60bf98c
--- 1/gst-libs/gst/fft/gstfftf32.h
--- 2/gst-libs/gst/fft/gstfftf32.h
+++ b/gst-libs/gst/fft/gstfftf32.h
@@@ -46,14 -66,14 +48,16 @@@ struct _GstFFTF32Comple
  };
  
  /* Functions */
 +GstFFTF32 *   gst_fft_f32_new           (gint len, gboolean inverse);
 +void          gst_fft_f32_free          (GstFFTF32 *self);
  
 -GstFFTF32 * gst_fft_f32_new (gint len, gboolean inverse);
 -void gst_fft_f32_fft (GstFFTF32 *self, const gfloat *timedata, GstFFTF32Complex *freqdata);
 -void gst_fft_f32_inverse_fft (GstFFTF32 *self, const GstFFTF32Complex *freqdata, gfloat *timedata);
 -void gst_fft_f32_free (GstFFTF32 *self);
 +void          gst_fft_f32_fft           (GstFFTF32 *self, const gfloat *timedata,
 +                                         GstFFTF32Complex *freqdata);
 +void          gst_fft_f32_inverse_fft   (GstFFTF32 *self, const GstFFTF32Complex *freqdata,
 +                                         gfloat *timedata);
  
 -void gst_fft_f32_window (GstFFTF32 *self, gfloat *timedata, GstFFTWindow window);
 +void          gst_fft_f32_window        (GstFFTF32 *self, gfloat *timedata, GstFFTWindow window);
  
+ G_END_DECLS
+ 
  #endif /* __GST_FFT_F32_H__ */

diff --cc gst-libs/gst/fft/gstfftf64.h
index 7bb42ca,66a830a..782bd8b
--- 1/gst-libs/gst/fft/gstfftf64.h
--- 2/gst-libs/gst/fft/gstfftf64.h
+++ b/gst-libs/gst/fft/gstfftf64.h
@@@ -46,14 -66,14 +48,16 @@@ struct _GstFFTF64Comple
  };
  
  /* Functions */
 +GstFFTF64 *     gst_fft_f64_new         (gint len, gboolean inverse);
 +void            gst_fft_f64_free        (GstFFTF64 *self);
  
 -GstFFTF64 * gst_fft_f64_new (gint len, gboolean inverse);
 -void gst_fft_f64_fft (GstFFTF64 *self, const gdouble *timedata, GstFFTF64Complex *freqdata);
 -void gst_fft_f64_inverse_fft (GstFFTF64 *self, const GstFFTF64Complex *freqdata, gdouble *timedata);
 -void gst_fft_f64_free (GstFFTF64 *self);
 +void            gst_fft_f64_fft         (GstFFTF64 *self, const gdouble *timedata,
 +                                         GstFFTF64Complex *freqdata);
 +void            gst_fft_f64_inverse_fft (GstFFTF64 *self, const GstFFTF64Complex *freqdata,
 +                                         gdouble *timedata);
  
 -void gst_fft_f64_window (GstFFTF64 *self, gdouble *timedata, GstFFTWindow window);
 +void            gst_fft_f64_window      (GstFFTF64 *self, gdouble *timedata, GstFFTWindow window);
  
+ G_END_DECLS
+ 
  #endif /* __GST_FFT_F64_H__ */

diff --cc gst-libs/gst/fft/gstffts16.h
index 30cbdee,cae969b..4f94bb0
--- 1/gst-libs/gst/fft/gstffts16.h
--- 2/gst-libs/gst/fft/gstffts16.h
+++ b/gst-libs/gst/fft/gstffts16.h
@@@ -46,14 -66,14 +48,16 @@@ struct _GstFFTS16Comple
  };
  
  /* Functions */
 +GstFFTS16 *     gst_fft_s16_new         (gint len, gboolean inverse);
 +void            gst_fft_s16_free        (GstFFTS16 *self);
  
 -GstFFTS16 * gst_fft_s16_new (gint len, gboolean inverse);
 -void gst_fft_s16_fft (GstFFTS16 *self, const gint16 *timedata, GstFFTS16Complex *freqdata);
 -void gst_fft_s16_inverse_fft (GstFFTS16 *self, const GstFFTS16Complex *freqdata, gint16 *timedata);
 -void gst_fft_s16_free (GstFFTS16 *self);
 +void            gst_fft_s16_fft         (GstFFTS16 *self, const gint16 *timedata,
 +                                         GstFFTS16Complex *freqdata);
 +void            gst_fft_s16_inverse_fft (GstFFTS16 *self, const GstFFTS16Complex *freqdata,
 +                                         gint16 *timedata);
  
 -void gst_fft_s16_window (GstFFTS16 *self, gint16 *timedata, GstFFTWindow window);
 +void            gst_fft_s16_window      (GstFFTS16 *self, gint16 *timedata, GstFFTWindow window);
  
+ G_END_DECLS
+ 
  #endif /* __GST_FFT_S16_H__ */

diff --cc gst-libs/gst/fft/gstffts32.h
index f73ad96,281434b..99d7815
--- 1/gst-libs/gst/fft/gstffts32.h
--- 2/gst-libs/gst/fft/gstffts32.h
+++ b/gst-libs/gst/fft/gstffts32.h
@@@ -46,14 -66,14 +48,16 @@@ struct _GstFFTS32Comple
  };
  
  /* Functions */
 +GstFFTS32 *     gst_fft_s32_new         (gint len, gboolean inverse);
 +void            gst_fft_s32_free        (GstFFTS32 *self);
  
 -GstFFTS32 * gst_fft_s32_new (gint len, gboolean inverse);
 -void gst_fft_s32_fft (GstFFTS32 *self, const gint32 *timedata, GstFFTS32Complex *freqdata);
 -void gst_fft_s32_inverse_fft (GstFFTS32 *self, const GstFFTS32Complex *freqdata, gint32 *timedata);
 -void gst_fft_s32_free (GstFFTS32 *self);
 +void            gst_fft_s32_fft         (GstFFTS32 *self, const gint32 *timedata,
 +                                         GstFFTS32Complex *freqdata);
 +void            gst_fft_s32_inverse_fft (GstFFTS32 *self, const GstFFTS32Complex *freqdata,
 +                                         gint32 *timedata);
  
 -void gst_fft_s32_window (GstFFTS32 *self, gint32 *timedata, GstFFTWindow window);
 +void            gst_fft_s32_window      (GstFFTS32 *self, gint32 *timedata, GstFFTWindow window);
  
+ G_END_DECLS
+ 
  #endif /* __GST_FFT_S32_H__ */

diff --cc gst/audioresample/gstaudioresample.c
Simple merge

diff --cc gst/playback/gstplaysinkconvertbin.c
index d5479e6,b365526..38a3476
--- 1/gst/playback/gstplaysinkconvertbin.c
--- 2/gst/playback/gstplaysinkconvertbin.c
+++ b/gst/playback/gstplaysinkconvertbin.c
@@@ -396,9 -389,9 +396,9 @@@ gst_play_sink_convert_bin_getcaps (GstP
    if (otherpad) {
      peer = gst_pad_get_peer (otherpad);
      if (peer) {
 -      GstCaps *peer_caps = gst_pad_get_caps_reffed (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;

diff --cc gst/typefind/gsttypefindfunctions.c
Simple merge