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

[platform/upstream/gst-plugins-good.git] / gst / audiofx / audioecho.c

diff --git a/gst/audiofx/audioecho.c b/gst/audiofx/audioecho.c
index feb0d36..38cafd2 100644 (file)
--- a/gst/audiofx/audioecho.c
+++ b/gst/audiofx/audioecho.c
@@ -50,7 +50,6 @@
 #include <gst/base/gstbasetransform.h>
 #include <gst/audio/audio.h>
 #include <gst/audio/gstaudiofilter.h>
-#include <gst/controller/gstcontroller.h>
 
 #include "audioecho.h"
 
@@ -370,12 +369,12 @@ gst_audio_echo_transform_ip (GstBaseTransform * base, GstBuffer * buf)
       GST_TIME_ARGS (timestamp));
 
   if (GST_CLOCK_TIME_IS_VALID (stream_time))
-    gst_object_sync_values (G_OBJECT (self), stream_time);
+    gst_object_sync_values (GST_OBJECT (self), stream_time);
 
   if (self->buffer == NULL) {
     guint bpf, rate;
 
-    bpf = GST_AUDIO_FILTER_BPS (self);
+    bpf = GST_AUDIO_FILTER_BPF (self);
     rate = GST_AUDIO_FILTER_RATE (self);
 
     self->delay_frames =