diff --git a/ChangeLog b/ChangeLog
index af39c73f7c..e838659fe7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2007-12-06  Sebastian Dröge  <slomo@circular-chaos.org>
+
+	* gst/filter/gstbpwsinc.c: (bpwsinc_transform):
+	* gst/filter/gstlpwsinc.c: (lpwsinc_transform):
+	Sync the GObject properties with the controller even in passthrough
+	mode to get consistent property values.
+
 2007-12-06  Tim-Philipp Müller  <tim at centricular dot net>
 
 	* gst/mpegtsparse/mpegtsparse.c: (crc_tab):
@@ -21,6 +28,7 @@
 	* sys/dvb/dvbbasebin.c:
 	Make sure initial pids are added properly to filter,
 
+>>>>>>> 1.2909
 2007-12-05  Andy Wingo  <wingo@pobox.com>
 
 	* gst/switch/gstswitch.c (gst_switch_set_property): Don't push
diff --git a/gst/filter/gstbpwsinc.c b/gst/filter/gstbpwsinc.c
index c11bd59aca..24a89abdc7 100644
--- a/gst/filter/gstbpwsinc.c
+++ b/gst/filter/gstbpwsinc.c
@@ -590,16 +590,15 @@ bpwsinc_transform (GstBaseTransform * base, GstBuffer * inbuf,
   gint output_samples = input_samples;
   gint diff;
 
+  /* FIXME: subdivide GST_BUFFER_SIZE into small chunks for smooth fades */
+  timestamp = GST_BUFFER_TIMESTAMP (outbuf);
+  if (GST_CLOCK_TIME_IS_VALID (timestamp))
+    gst_object_sync_values (G_OBJECT (self), timestamp);
+
   /* don't process data in passthrough-mode */
   if (gst_base_transform_is_passthrough (base))
     return GST_FLOW_OK;
 
-  /* FIXME: subdivide GST_BUFFER_SIZE into small chunks for smooth fades */
-  timestamp = GST_BUFFER_TIMESTAMP (outbuf);
-
-  if (GST_CLOCK_TIME_IS_VALID (timestamp))
-    gst_object_sync_values (G_OBJECT (self), timestamp);
-
   if (!self->have_kernel)
     bpwsinc_build_kernel (self);
 
diff --git a/gst/filter/gstlpwsinc.c b/gst/filter/gstlpwsinc.c
index 32de5f067f..b40537147d 100644
--- a/gst/filter/gstlpwsinc.c
+++ b/gst/filter/gstlpwsinc.c
@@ -531,15 +531,15 @@ lpwsinc_transform (GstBaseTransform * base, GstBuffer * inbuf,
   gint output_samples = input_samples;
   gint diff;
 
-  /* don't process data in passthrough-mode */
-  if (gst_base_transform_is_passthrough (base))
-    return GST_FLOW_OK;
-
   /* FIXME: subdivide GST_BUFFER_SIZE into small chunks for smooth fades */
   timestamp = GST_BUFFER_TIMESTAMP (outbuf);
   if (GST_CLOCK_TIME_IS_VALID (timestamp))
     gst_object_sync_values (G_OBJECT (self), timestamp);
 
+  /* don't process data in passthrough-mode */
+  if (gst_base_transform_is_passthrough (base))
+    return GST_FLOW_OK;
+
   if (!self->have_kernel)
     lpwsinc_build_kernel (self);