Merge branch 'master' into 0.11

Conflicts:
	configure.ac
	gst/gstelement.c
	gst/gstelement.h
	gst/gstpad.c
	gst/gstutils.c
	libs/gst/base/Makefile.am
	libs/gst/check/Makefile.am
	libs/gst/controller/Makefile.am
	libs/gst/dataprotocol/Makefile.am
	libs/gst/net/Makefile.am
	win32/common/libgstreamer.def

diff --cc configure.ac
Simple merge

diff --cc docs/gst/gstreamer-sections.txt
Simple merge

diff --cc docs/libs/gstreamer-libs-sections.txt
Simple merge

diff --cc gst/Makefile.am
Simple merge

diff --cc gst/gstbin.c
Simple merge

diff --cc gst/gstcaps.c
Simple merge

diff --cc gst/gstconfig.h.in
Simple merge

diff --cc gst/gstelement.c
Simple merge

diff --cc gst/gstelement.h
index 1cdff866b280088fd1ee3c229dee2211ea17f503,b026dff24993a4619e9cb80317dc68a93d066a9d..3bd798de0e1f4661974ed7281bf1237567859575
--- 1/gst/gstelement.h
--- 2/gst/gstelement.h
+++ b/gst/gstelement.h
@@@ -653,8 -660,17 +654,15 @@@ struct _GstElementClas
    gboolean              (*query)                (GstElement *element, GstQuery *query);
  
    /*< private >*/
 -  /* FIXME-0.11: move up and replace details */
 -  gpointer            meta_data;
  
 -  gpointer _gst_reserved[GST_PADDING-2];
+   /*< public >*/
+   /* Virtual method for subclasses (additions) */
+   /* FIXME-0.11 Make this the default behaviour */
+   GstPad*             (*request_new_pad_full) (GstElement *element, GstPadTemplate *templ,
+                                                const gchar* name, const GstCaps *caps);
+ 
+   /*< private >*/
 +  gpointer _gst_reserved[GST_PADDING];
  };
  
  /* element class pad templates */
@@@ -742,8 -760,14 +750,11 @@@ gboolean                gst_element_add
  gboolean                gst_element_remove_pad          (GstElement *element, GstPad *pad);
  void                    gst_element_no_more_pads        (GstElement *element);
  
 -#ifndef GST_DISABLE_DEPRECATED
 -GstPad*                 gst_element_get_pad             (GstElement *element, const gchar *name);
 -#endif /* GST_DISABLE_DEPRECATED */
  GstPad*                 gst_element_get_static_pad      (GstElement *element, const gchar *name);
  GstPad*                 gst_element_get_request_pad     (GstElement *element, const gchar *name);
+ GstPad*                 gst_element_request_pad         (GstElement *element,
+                                                        GstPadTemplate *templ,
+                                                        const gchar * name, const GstCaps *caps);
  void                    gst_element_release_request_pad (GstElement *element, GstPad *pad);
  
  GstIterator *           gst_element_iterate_pads        (GstElement * element);

diff --cc gst/gstelementfactory.c
Simple merge

diff --cc gst/gstghostpad.c
Simple merge

diff --cc gst/gstobject.c
Simple merge

diff --cc gst/gstpad.c
Simple merge

diff --cc gst/gstpadtemplate.c
Simple merge

diff --cc gst/gstpipeline.c
Simple merge

diff --cc gst/gstplugin.c
Simple merge

diff --cc gst/gstregistry.h
Simple merge

diff --cc gst/gstregistrybinary.c
Simple merge

diff --cc gst/gstregistrychunks.c
Simple merge

diff --cc gst/gstutils.c
Simple merge

diff --cc gst/gstutils.h
Simple merge

diff --cc libs/gst/base/Makefile.am
index 4ba90e956e8d58e6662876c6eda083db05bc658b,483aa8ee8706913be7a995f2050c65226e50d29f..c7000eda80d108d1044c7e647f66ecefaeead59f
--- 1/libs/gst/base/Makefile.am
--- 2/libs/gst/base/Makefile.am
+++ b/libs/gst/base/Makefile.am
@@@ -61,13 -61,17 +61,17 @@@ GstBase-@GST_MAJORMINOR@.gir: $(INTROSP
                --strip-prefix=Gst \
                -I$(top_srcdir) \
                -I$(top_srcdir)/libs \
+               -I$(top_builddir) \
+               -I$(top_builddir)/libs \
                $(gir_cincludes) \
                --add-include-path=$(top_builddir)/gst \
 -              --library=$(top_builddir)/gst/libgstreamer-0.10.la \
 -              --library=libgstbase-0.10.la \
 -              --include=Gst-0.10 \
+               --library-path=$(top_builddir)/gst \
++              --library=$(top_builddir)/gst/libgstreamer-0.11.la \
 +              --library=libgstbase-0.11.la \
 +              --include=Gst-0.11 \
                --libtool="$(top_builddir)/libtool" \
 -              --pkg gstreamer-0.10 \
 -              --pkg-export gstreamer-base-0.10 \
 +              --pkg gstreamer-0.11 \
 +              --pkg-export gstreamer-base-0.11 \
                --output $@ \
                $(gir_headers) \
                $(gir_sources)

diff --cc libs/gst/base/gstbasesrc.c
Simple merge

diff --cc libs/gst/base/gstbasetransform.c
Simple merge

diff --cc libs/gst/check/Makefile.am
index 0040ba5e373f1cb71471f5580c113337a426e611,c5fb3ee3528bdfad5ae88262b68187eb59570f94..567c3a2b046660f527ad5e123aa4a86b9ae32c4e
--- 1/libs/gst/check/Makefile.am
--- 2/libs/gst/check/Makefile.am
+++ b/libs/gst/check/Makefile.am
@@@ -121,13 -121,17 +121,17 @@@ GstCheck-@GST_MAJORMINOR@.gir: $(INTROS
                --strip-prefix=Gst \
                -I$(top_srcdir) \
                -I$(top_srcdir)/libs \
+               -I$(top_builddir) \
+               -I$(top_builddir)/libs \
                $(gir_cincludes) \
                --add-include-path=$(top_builddir)/gst \
 -              --library=$(top_builddir)/gst/libgstreamer-0.10.la \
 -              --library=libgstcheck-0.10.la \
 -              --include=Gst-0.10 \
+               --library-path=$(top_builddir)/gst \
++              --library=$(top_builddir)/gst/libgstreamer-0.11.la \
 +              --library=libgstcheck-0.11.la \
 +              --include=Gst-0.11 \
                --libtool="$(top_builddir)/libtool" \
 -              --pkg gstreamer-0.10 \
 -              --pkg-export gstreamer-check-0.10 \
 +              --pkg gstreamer-0.11 \
 +              --pkg-export gstreamer-check-0.11 \
                --output $@ \
                $(gir_headers) \
                $(gir_sources)

diff --cc libs/gst/controller/Makefile.am
index a21de5699144105b5056e69c6c35f69c0bbbad73,d98a1abb8ac8e855f55664c3ad6c88f6899f6152..187cfe8b2aa129b37db406f5621bde87c70c5078
--- 1/libs/gst/controller/Makefile.am
--- 2/libs/gst/controller/Makefile.am
+++ b/libs/gst/controller/Makefile.am
@@@ -45,13 -45,18 +45,18 @@@ GstController-@GST_MAJORMINOR@.gir: $(I
                --nsversion=@GST_MAJORMINOR@ \
                --strip-prefix=Gst \
                -I$(top_srcdir) \
+               -I$(top_srcdir)/libs \
+               -I$(top_builddir) \
+               -I$(top_builddir)/libs \
                $(gir_cincludes) \
                --add-include-path=$(top_builddir)/gst \
-               --library=libgstcontroller-@GST_MAJORMINOR@.la \
-               --include=Gst-@GST_MAJORMINOR@ \
+               --library-path=$(top_builddir)/gst \
 -              --library=$(top_builddir)/gst/libgstreamer-0.10.la \
 -              --library=libgstcontroller-0.10.la \
 -              --include=Gst-0.10 \
++              --library=$(top_builddir)/gst/libgstreamer-0.11.la \
++              --library=libgstcontroller-0.11.la \
++              --include=Gst-0.11 \
                --libtool="$(top_builddir)/libtool" \
 -              --pkg gstreamer-0.10 \
 -              --pkg-export gstreamer-controller-0.10 \
 +              --pkg gstreamer-@GST_MAJORMINOR@ \
 +              --pkg-export gstreamer-controller-@GST_MAJORMINOR@ \
                --output $@ \
                $(gir_headers) \
                $(gir_sources)

diff --cc libs/gst/controller/gstcontroller.c
Simple merge

diff --cc libs/gst/controller/gstcontroller.h
Simple merge

diff --cc libs/gst/dataprotocol/Makefile.am
index 0ff881cab3a25d9a10262e4c1a879e75cb1ef9da,8a9578e3a6b4a6b318b45f43a95bdf8fdd8f7ef0..5c376d1d77bc26233c31f2a8c2e5c5c3427f9dc2
--- 1/libs/gst/dataprotocol/Makefile.am
--- 2/libs/gst/dataprotocol/Makefile.am
+++ b/libs/gst/dataprotocol/Makefile.am
@@@ -35,13 -35,16 +35,16 @@@ GstDataprotocol-@GST_MAJORMINOR@.gir: $
                --strip-prefix=Gst \
                --nsversion=@GST_MAJORMINOR@ \
                -I$(top_srcdir) \
+               -I$(top_builddir) \
                $(gir_cincludes) \
                --add-include-path=$(top_builddir)/gst \
 -              --library=$(top_builddir)/gst/libgstreamer-0.10.la \
 -              --library=libgstdataprotocol-0.10.la \
 -              --include=Gst-0.10 \
+               --library-path=$(top_builddir)/gst \
++              --library=$(top_builddir)/gst/libgstreamer-@GST_MAJORMINOR@.la \
 +              --library=libgstdataprotocol-@GST_MAJORMINOR@.la \
 +              --include=Gst-@GST_MAJORMINOR@ \
                --libtool="$(top_builddir)/libtool" \
 -              --pkg gstreamer-0.10 \
 -              --pkg-export=gstreamer-dataprotocol-0.10 \
 +              --pkg gstreamer-@GST_MAJORMINOR@ \
 +              --pkg-export=gstreamer-dataprotocol-@GST_MAJORMINOR@ \
                --output $@ \
                $(gir_headers) \
                $(gir_sources)

diff --cc libs/gst/net/Makefile.am
index 87dfcef35457404daf8861902f0875aa24d1f413,155a6d247baf5d0299a699dc654a73257c0050be..c20344965622908612926c485b297e93c254a331
--- 1/libs/gst/net/Makefile.am
--- 2/libs/gst/net/Makefile.am
+++ b/libs/gst/net/Makefile.am
@@@ -37,13 -37,17 +37,17 @@@ GstNet-@GST_MAJORMINOR@.gir: $(INTROSPE
                --nsversion=@GST_MAJORMINOR@ \
                -I$(top_srcdir) \
                -I$(top_srcdir)/libs \
+               -I$(top_builddir) \
+               -I$(top_builddir)/libs \
                $(gir_cincludes) \
                --add-include-path=$(top_builddir)/gst \
 -              --library=$(top_builddir)/gst/libgstreamer-0.10.la \
 -              --library=libgstnet-0.10.la \
 -              --include=Gst-0.10 \
+               --library-path=$(top_builddir)/gst \
++              --library=$(top_builddir)/gst/libgstreamer-@GST_MAJORMINOR@.la \
 +              --library=libgstnet-@GST_MAJORMINOR@.la \
 +              --include=Gst-@GST_MAJORMINOR@ \
                --libtool="$(top_builddir)/libtool" \
 -              --pkg gstreamer-0.10 \
 -              --pkg-export="gstreamer-net-0.10" \
 +              --pkg gstreamer-@GST_MAJORMINOR@ \
 +              --pkg-export="gstreamer-net-@GST_MAJORMINOR@" \
                --output $@ \
                $(gir_headers) \
                $(gir_sources)

diff --cc tests/check/Makefile.am
Simple merge

diff --cc tools/gst-launch.c
Simple merge

diff --cc win32/common/libgstreamer.def
Simple merge