Merge branch 'master' into 0.11
authorWim Taymans <wim.taymans@collabora.co.uk>
Mon, 22 Aug 2011 11:10:07 +0000 (13:10 +0200)
committerWim Taymans <wim.taymans@collabora.co.uk>
Mon, 22 Aug 2011 11:10:07 +0000 (13:10 +0200)
1  2 
gst/debugutils/breakmydata.c
gst/multifile/gstmultifilesink.c
gst/multifile/gstmultifilesrc.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
Simple merge
Simple merge