From: Wim Taymans <wim.taymans@collabora.co.uk>
Date: Wed, 30 Mar 2011 17:58:52 +0000 (+0200)
Subject: Merge branch 'master' into 0.11-fdo
X-Git-Tag: RELEASE-0.11.0~481
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=7a62d32a0757c0d66a29ab32c775d324c3ff8b11;p=platform%2Fupstream%2Fgstreamer.git

Merge branch 'master' into 0.11-fdo

Conflicts:
	docs/plugins/gstreamer-plugins.hierarchy
	gst/gstelement.c
---

7a62d32a0757c0d66a29ab32c775d324c3ff8b11
diff --cc docs/plugins/gstreamer-plugins.hierarchy
index f5f9bb1,4201ecb..1c36392
--- a/docs/plugins/gstreamer-plugins.hierarchy
+++ b/docs/plugins/gstreamer-plugins.hierarchy
@@@ -1,44 -1,45 +1,45 @@@
  GObject
 -  GstObject
 -    GstPad
 -    GstPadTemplate
 -    GstPluginFeature
 -      GstElementFactory
 -      GstTypeFindFactory
 -      GstIndexFactory
 -    GstElement
 -      GstBin
 -        GstPipeline
 -      GstBaseTransform
 -        GstCapsFilter
 -        GstIdentity
 -      GstBaseSrc
 -        GstFakeSrc
 -        GstPushSrc
 -          GstFdSrc
 -        GstFileSrc
 -      GstBaseSink
 -        GstFakeSink
 -        GstFdSink
 -        GstFileSink
 -      GstFunnel
 -      GstInputSelector
 -      GstOutputSelector
 -      GstQueue
 -      GstQueue2
 -      GstTee
 -      GstTypeFindElement
 -      GstMultiQueue
 -      GstValve
 -    GstBus
 -    GstTask
 -    GstTaskPool
 -    GstClock
 -    GstPlugin
 -    GstRegistry
 -    GstIndex
 -      GstMemIndex
 -      GstFileIndex
 -  GstSignalObject
 +  GInitiallyUnowned
 +    GstObject
 +      GstPad
 +      GstPadTemplate
 +      GstPluginFeature
 +        GstElementFactory
 +        GstTypeFindFactory
 +        GstIndexFactory
 +      GstElement
 +        GstBin
 +          GstPipeline
 +        GstBaseTransform
 +          GstCapsFilter
 +          GstIdentity
 +        GstBaseSrc
 +          GstFakeSrc
 +          GstPushSrc
 +            GstFdSrc
 +          GstFileSrc
 +        GstBaseSink
 +          GstFakeSink
 +          GstFdSink
 +          GstFileSink
++        GstFunnel
 +        GstInputSelector
 +        GstOutputSelector
 +        GstQueue
 +        GstQueue2
 +        GstTee
 +        GstTypeFindElement
 +        GstMultiQueue
 +        GstValve
 +      GstBus
 +      GstTask
 +      GstTaskPool
 +      GstClock
 +      GstPlugin
 +      GstRegistry
 +      GstIndex
 +        GstMemIndex
 +        GstFileIndex
  GInterface
    GTypePlugin
    GstChildProxy