From: Wim Taymans <wim.taymans@collabora.co.uk>
Date: Mon, 22 Aug 2011 11:10:07 +0000 (+0200)
Subject: Merge branch 'master' into 0.11
X-Git-Tag: 1.19.3~509^2~7666
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d6908f1a2daae4c6c1980a6fa74892deb8c24cb9;p=platform%2Fupstream%2Fgstreamer.git

Merge branch 'master' into 0.11
---

d6908f1a2daae4c6c1980a6fa74892deb8c24cb9
diff --cc gst/debugutils/breakmydata.c
index 4fe8a01,c4009fc..d641623
--- a/gst/debugutils/breakmydata.c
+++ b/gst/debugutils/breakmydata.c
@@@ -154,10 -159,9 +154,9 @@@ gst_break_my_data_class_init (GstBreakM
  }
  
  static void
 -gst_break_my_data_init (GstBreakMyData * bmd, GstBreakMyDataClass * g_class)
 +gst_break_my_data_init (GstBreakMyData * bmd)
  {
    gst_base_transform_set_in_place (GST_BASE_TRANSFORM (bmd), TRUE);
-   gst_base_transform_set_passthrough (GST_BASE_TRANSFORM (bmd), TRUE);
  }
  
  static void