Merge remote-tracking branch 'origin/master' into 0.11
authorTim-Philipp Müller <tim.muller@collabora.co.uk>
Sun, 26 Jun 2011 20:27:28 +0000 (21:27 +0100)
committerTim-Philipp Müller <tim.muller@collabora.co.uk>
Sun, 26 Jun 2011 20:27:28 +0000 (21:27 +0100)
1  2 
docs/design/design-decodebin.txt
gst-libs/gst/pbutils/encoding-target.c
tests/check/libs/navigation.c

Simple merge
@@@ -92,24 -89,8 +84,8 @@@ test_element_class_init (TestElementCla
  {
  }
  
- static gboolean
- test_element_interface_supported (GstImplementsInterface * ifacE,
-     GType interface_type)
- {
-   if (interface_type == GST_TYPE_NAVIGATION)
-     return TRUE;
-   return FALSE;
- }
- static void
- gst_implements_interface_init (GstImplementsInterfaceClass * klass)
- {
-   klass->supported = test_element_interface_supported;
- }
  static void
 -test_element_init (TestElement * this, TestElementClass * klass)
 +test_element_init (TestElement * this)
  {
  }