diff --git a/ChangeLog b/ChangeLog
index 0a7a1f86b7..3fcbd6677c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-11-20  Jan Schmidt  <jan.schmidt@sun.com>
+
+	* ext/libpng/gstpngenc.c:
+	Don't flush downstream after every buffer - that's not what
+	this libpng callback is for at all!
+
 2008-11-17  Tim-Philipp Müller  <tim.muller at collabora co uk>
 
 	* sys/v4l2/v4l2src_calls.c:
diff --git a/ext/libpng/gstpngenc.c b/ext/libpng/gstpngenc.c
index 1d26ef7984..160958c183 100644
--- a/ext/libpng/gstpngenc.c
+++ b/ext/libpng/gstpngenc.c
@@ -208,17 +208,10 @@ gst_pngenc_init (GstPngEnc * pngenc, GstPngEncClass * g_class)
 }
 
 static void
-user_flush_data (png_structp png_ptr)
+user_flush_data (png_structp png_ptr G_GNUC_UNUSED)
 {
-  GstPngEnc *pngenc;
-
-  pngenc = (GstPngEnc *) png_get_io_ptr (png_ptr);
-
-  gst_pad_push_event (pngenc->srcpad, gst_event_new_flush_start ());
-  gst_pad_push_event (pngenc->srcpad, gst_event_new_flush_stop ());
 }
 
-
 static void
 user_write_data (png_structp png_ptr, png_bytep data, png_uint_32 length)
 {
@@ -313,8 +306,6 @@ gst_pngenc_chain (GstPad * pad, GstBuffer * buf)
   png_write_image (pngenc->png_struct_ptr, row_pointers);
   png_write_end (pngenc->png_struct_ptr, NULL);
 
-  user_flush_data (pngenc->png_struct_ptr);
-
   encoded_buf = gst_buffer_create_sub (pngenc->buffer_out, 0, pngenc->written);
 
   png_destroy_info_struct (pngenc->png_struct_ptr, &pngenc->png_info_ptr);