Merge branch 'master' into 0.11

Conflicts:
	android/alsa.mk
	android/app.mk
	android/app_plugin.mk
	android/audio.mk
	android/audioconvert.mk
	android/decodebin.mk
	android/decodebin2.mk
	android/gdp.mk
	android/interfaces.mk
	android/netbuffer.mk
	android/pbutils.mk
	android/playbin.mk
	android/queue2.mk
	android/riff.mk
	android/rtp.mk
	android/rtsp.mk
	android/sdp.mk
	android/tag.mk
	android/tcp.mk
	android/typefindfunctions.mk
	android/video.mk

diff --cc android/alsa.mk
Simple merge

diff --cc android/app.mk
index c579657,88dfb7d..ffa9459
--- 1/android/app.mk
--- 2/android/app.mk
+++ b/android/app.mk
@@@ -14,40 -14,23 +14,23 @@@ LOCAL_ARM_MODE := ar
  app_LOCAL_SRC_FILES_BASE:= \
        gst-libs/gst/app/gstappsrc.c \
        gst-libs/gst/app/gstappbuffer.c \
-       gst-libs/gst/app/gstappsink.c 
- app_LOCAL_SRC_FILES_ANDROID:= \
+       gst-libs/gst/app/gstappsink.c  \
        gst-libs/gst/app/gstapp-marshal.c
        
- LOCAL_SRC_FILES:= $(addprefix ../,$(app_LOCAL_SRC_FILES_BASE)) \
-                                 $(addprefix ../android/,$(app_LOCAL_SRC_FILES_ANDROID))
+ LOCAL_SRC_FILES:= $(addprefix ../,$(app_LOCAL_SRC_FILES_BASE))
  
  LOCAL_SHARED_LIBRARIES := \
 -    libgstreamer-0.10       \
 -    libgstbase-0.10         \
 +    libgstreamer-0.11       \
 +    libgstbase-0.11         \
      libglib-2.0             \
      libgthread-2.0          \
      libgmodule-2.0          \
      libgobject-2.0 
  
 -LOCAL_MODULE:= libgstapp-0.10
 +LOCAL_MODULE:= libgstapp-0.11
  
- LOCAL_C_INCLUDES := \
-     $(LOCAL_PATH)/../gst-libs/gst/app   \
-     $(LOCAL_PATH)/../gst-libs                 \
-     $(LOCAL_PATH)/..                          \
-     $(LOCAL_PATH)                                     \
-       $(LOCAL_PATH)/gst-libs/gst/app          \
-     $(TARGET_OUT_HEADERS)/gstreamer-0.11 \
-       $(TARGET_OUT_HEADERS)/glib-2.0          \
-     $(TARGET_OUT_HEADERS)/glib-2.0/glib \
-       external/libxml2/include
- 
- ifeq ($(STECONF_ANDROID_VERSION),"FROYO")
- LOCAL_SHARED_LIBRARIES += libicuuc 
- LOCAL_C_INCLUDES += external/icu4c/common
- endif
- 
- LOCAL_CFLAGS := -DHAVE_CONFIG_H        -DGSTREAMER_BUILT_FOR_ANDROID
+ LOCAL_CFLAGS := -DHAVE_CONFIG_H        -DGSTREAMER_BUILT_FOR_ANDROID \
+       $(GST_PLUGINS_BASE_CFLAGS)
  #
  # define LOCAL_PRELINK_MODULE to false to not use pre-link map
  #

diff --cc android/app_plugin.mk
index 7d69ab7,8e067fc..179e6c8
--- 1/android/app_plugin.mk
--- 2/android/app_plugin.mk
+++ b/android/app_plugin.mk
@@@ -41,7 -27,8 +27,8 @@@ LOCAL_CFLAGS := -DHAVE_CONFIG_H        -DGSTR
  #
  LOCAL_PRELINK_MODULE := false
  
 -#It's a gstreamer plugins, and it must be installed on ..../lib/gstreamer-0.10
 -LOCAL_MODULE_PATH := $(TARGET_OUT)/lib/gstreamer-0.10
 +#It's a gstreamer plugins, and it must be installed on ..../lib/gstreamer-0.11
 +LOCAL_MODULE_PATH := $(TARGET_OUT)/lib/gstreamer-0.11
+ LOCAL_MODULE_TAGS := optional
  
  include $(BUILD_SHARED_LIBRARY)

diff --cc android/audio.mk
index 96cdaac,fa24286..cb613a5
--- 1/android/audio.mk
--- 2/android/audio.mk
+++ b/android/audio.mk
@@@ -36,41 -33,24 +33,24 @@@ audio_LOCAL_SRC_FILES_BASE:= 
        gst-libs/gst/audio/gstaudiosrc.c \
        gst-libs/gst/audio/gstbaseaudiosink.c \
        gst-libs/gst/audio/gstbaseaudiosrc.c \
-       gst-libs/gst/audio/gstringbuffer.c 
- audio_LOCAL_SRC_FILES_ANDROID:= \
+       gst-libs/gst/audio/gstringbuffer.c  \
        gst-libs/gst/audio/audio-enumtypes.c
          
- LOCAL_SRC_FILES:= $(addprefix ../,$(audio_LOCAL_SRC_FILES_BASE)) \
-                                 $(addprefix ../android/,$(audio_LOCAL_SRC_FILES_ANDROID))
+ LOCAL_SRC_FILES:= $(addprefix ../,$(audio_LOCAL_SRC_FILES_BASE))
  
  LOCAL_SHARED_LIBRARIES := \
 -    libgstreamer-0.10       \
 -    libgstbase-0.10         \
 +    libgstreamer-0.11       \
 +    libgstbase-0.11         \
      libglib-2.0             \
      libgthread-2.0          \
      libgmodule-2.0          \
      libgobject-2.0                    \
 -      libgstinterfaces-0.10
 +      libgstinterfaces-0.11
  
 -LOCAL_MODULE:= libgstaudio-0.10
 +LOCAL_MODULE:= libgstaudio-0.11
  
- LOCAL_C_INCLUDES := \
-     $(LOCAL_PATH)/../gst-libs/gst/audio \
-     $(LOCAL_PATH)/../gst-libs           \
-     $(LOCAL_PATH)/..                          \
-     $(LOCAL_PATH)                                             \
-       $(LOCAL_PATH)/gst-libs/gst/audio        \
-     $(TARGET_OUT_HEADERS)/gstreamer-0.11 \
-       $(TARGET_OUT_HEADERS)/glib-2.0          \
-     $(TARGET_OUT_HEADERS)/glib-2.0/glib \
-       external/libxml2/include
- 
- ifeq ($(STECONF_ANDROID_VERSION),"FROYO")
- LOCAL_SHARED_LIBRARIES += libicuuc 
- LOCAL_C_INCLUDES += external/icu4c/common
- endif
- 
- LOCAL_CFLAGS := -DHAVE_CONFIG_H       -DGSTREAMER_BUILT_FOR_ANDROID
+ LOCAL_CFLAGS := -DHAVE_CONFIG_H       -DGSTREAMER_BUILT_FOR_ANDROID \
+       $(GST_PLUGINS_BASE_CFLAGS)
  #
  # define LOCAL_PRELINK_MODULE to false to not use pre-link map
  #

diff --cc android/audioconvert.mk
index ef2537f,015f39c..059b295
--- 1/android/audioconvert.mk
--- 2/android/audioconvert.mk
+++ b/android/audioconvert.mk
@@@ -47,7 -33,8 +33,8 @@@ LOCAL_CFLAGS := -DHAVE_CONFIG_H -DGSTRE
  #
  LOCAL_PRELINK_MODULE := false
  
 -#It's a gstreamer plugins, and it must be installed on ..../lib/gstreamer-0.10
 -LOCAL_MODULE_PATH := $(TARGET_OUT)/lib/gstreamer-0.10
 +#It's a gstreamer plugins, and it must be installed on ..../lib/gstreamer-0.11
 +LOCAL_MODULE_PATH := $(TARGET_OUT)/lib/gstreamer-0.11
+ LOCAL_MODULE_TAGS := optional
  
  include $(BUILD_SHARED_LIBRARY)

diff --cc android/decodebin.mk
index 68d8821,2d20164..3a94fee
--- 1/android/decodebin.mk
--- 2/android/decodebin.mk
+++ b/android/decodebin.mk
@@@ -5,16 -5,14 +5,14 @@@ include $(CLEAR_VARS
  LOCAL_ARM_MODE := arm
  
  decodebin_LOCAL_SRC_FILES_BASE:= \
-       gst/playback/gstdecodebin.c 
- decodebin_LOCAL_SRC_FILES_ANDROID:= \
+       gst/playback/gstdecodebin.c  \
      gst/playback/gstplay-marshal.c
  
- LOCAL_SRC_FILES:= $(addprefix ../,$(decodebin_LOCAL_SRC_FILES_BASE)) \
-                                 $(addprefix ../android/,$(decodebin_LOCAL_SRC_FILES_ANDROID))
+ LOCAL_SRC_FILES:= $(addprefix ../,$(decodebin_LOCAL_SRC_FILES_BASE))
  
  LOCAL_SHARED_LIBRARIES := \
 -    libgstreamer-0.10       \
 -    libgstbase-0.10         \
 +    libgstreamer-0.11       \
 +    libgstbase-0.11         \
      libglib-2.0             \
      libgthread-2.0          \
      libgmodule-2.0          \
@@@ -45,7 -28,8 +28,8 @@@ LOCAL_CFLAGS := -DHAVE_CONFIG_H       -DGSTRE
  #
  LOCAL_PRELINK_MODULE := false
  
 -#It's a gstreamer plugins, and it must be installed on ..../lib/gstreamer-0.10
 -LOCAL_MODULE_PATH := $(TARGET_OUT)/lib/gstreamer-0.10
 +#It's a gstreamer plugins, and it must be installed on ..../lib/gstreamer-0.11
 +LOCAL_MODULE_PATH := $(TARGET_OUT)/lib/gstreamer-0.11
+ LOCAL_MODULE_TAGS := optional
  
  include $(BUILD_SHARED_LIBRARY)

diff --cc android/decodebin2.mk
index 929219d,30f0ace..c9d32f2
--- 1/android/decodebin2.mk
--- 2/android/decodebin2.mk
+++ b/android/decodebin2.mk
@@@ -7,17 -7,14 +7,14 @@@ LOCAL_ARM_MODE := ar
  decodebin2_LOCAL_SRC_FILES_BASE:= \
        gst/playback/gstdecodebin2.c \
      gst/playback/gsturidecodebin.c \
-       gst/playback/gstfactorylists.c \
-       gst/playback/gstplay-enum.c 
- decodebin2_LOCAL_SRC_FILES_ANDROID:= \
+       gst/playback/gstplay-enum.c  \
        gst/playback/gstplay-marshal.c
  
- LOCAL_SRC_FILES:= $(addprefix ../,$(decodebin2_LOCAL_SRC_FILES_BASE)) \
-                                 $(addprefix ../android/,$(decodebin2_LOCAL_SRC_FILES_ANDROID))
+ LOCAL_SRC_FILES:= $(addprefix ../,$(decodebin2_LOCAL_SRC_FILES_BASE))
  
  LOCAL_SHARED_LIBRARIES := \
 -    libgstreamer-0.10       \
 -    libgstbase-0.10         \
 +    libgstreamer-0.11       \
 +    libgstbase-0.11         \
      libglib-2.0             \
      libgthread-2.0          \
      libgmodule-2.0          \
@@@ -48,7 -30,8 +30,8 @@@ LOCAL_CFLAGS := -DHAVE_CONFIG_H        
  #
  LOCAL_PRELINK_MODULE := false
  
 -#It's a gstreamer plugins, and it must be installed on ..../lib/gstreamer-0.10
 -LOCAL_MODULE_PATH := $(TARGET_OUT)/lib/gstreamer-0.10
 +#It's a gstreamer plugins, and it must be installed on ..../lib/gstreamer-0.11
 +LOCAL_MODULE_PATH := $(TARGET_OUT)/lib/gstreamer-0.11
+ LOCAL_MODULE_TAGS := optional
  
  include $(BUILD_SHARED_LIBRARY)

diff --cc android/gdp.mk
index f8b0b53,156bf28..801ad80
--- 1/android/gdp.mk
--- 2/android/gdp.mk
+++ b/android/gdp.mk
@@@ -44,7 -29,8 +29,8 @@@ LOCAL_CFLAGS := -DHAVE_CONFIG_H  -DGSTR
  #
  LOCAL_PRELINK_MODULE := false
  
 -#It's a gstreamer plugins, and it must be installed on ..../lib/gstreamer-0.10
 -LOCAL_MODULE_PATH := $(TARGET_OUT)/lib/gstreamer-0.10
 +#It's a gstreamer plugins, and it must be installed on ..../lib/gstreamer-0.11
 +LOCAL_MODULE_PATH := $(TARGET_OUT)/lib/gstreamer-0.11
+ LOCAL_MODULE_TAGS := optional
  
  include $(BUILD_SHARED_LIBRARY)

diff --cc android/interfaces.mk
index 9190867,61564b3..4f43a82
--- 1/android/interfaces.mk
--- 2/android/interfaces.mk
+++ b/android/interfaces.mk
@@@ -55,26 -52,11 +52,10 @@@ LOCAL_SHARED_LIBRARIES := 
      libgmodule-2.0          \
      libgobject-2.0
  
 -LOCAL_MODULE:= libgstinterfaces-0.10
 -
 +LOCAL_MODULE:= libgstinterfaces-0.11
  
- LOCAL_C_INCLUDES := \
-     $(LOCAL_PATH)/../gst-libs/gst/interfaces \
-     $(LOCAL_PATH)/../gst-libs           \
-     $(LOCAL_PATH)/..                          \
-     $(LOCAL_PATH)                                             \
-       $(LOCAL_PATH)/gst-libs/gst/interfaces \
-     $(TARGET_OUT_HEADERS)/gstreamer-0.11 \
-       $(TARGET_OUT_HEADERS)/glib-2.0          \
-     $(TARGET_OUT_HEADERS)/glib-2.0/glib \
-       external/libxml2/include
- 
- ifeq ($(STECONF_ANDROID_VERSION),"FROYO")
- LOCAL_SHARED_LIBRARIES += libicuuc 
- LOCAL_C_INCLUDES += external/icu4c/common
- endif
- 
- 
- LOCAL_CFLAGS := -DHAVE_CONFIG_H       -DGSTREAMER_BUILT_FOR_ANDROID
+ LOCAL_CFLAGS := -DHAVE_CONFIG_H       -DGSTREAMER_BUILT_FOR_ANDROID \
+       $(GST_PLUGINS_BASE_CFLAGS)
  #
  # define LOCAL_PRELINK_MODULE to false to not use pre-link map
  #

diff --cc android/netbuffer.mk
index 5a42f8c,fd904bd..8b217f9
--- 1/android/netbuffer.mk
--- 2/android/netbuffer.mk
+++ b/android/netbuffer.mk
@@@ -22,26 -22,10 +22,10 @@@ LOCAL_SHARED_LIBRARIES := 
      libgmodule-2.0          \
      libgobject-2.0
  
 -LOCAL_MODULE:= libgstnetbuffer-0.10
 +LOCAL_MODULE:= libgstnetbuffer-0.11
  
- LOCAL_C_INCLUDES := \
-     $(LOCAL_PATH)/../gst-libs/gst/netbuffer \
-     $(LOCAL_PATH)/../gst-libs                                 \
-     $(LOCAL_PATH)/..                                  \
-     $(LOCAL_PATH)                                             \
-       $(LOCAL_PATH)/../gst/tcp                        \
-     $(TARGET_OUT_HEADERS)/gstreamer-0.11    \
-       $(TARGET_OUT_HEADERS)/glib-2.0                  \
-     $(TARGET_OUT_HEADERS)/glib-2.0/glib     \
-       external/libxml2/include
- 
- 
- ifeq ($(STECONF_ANDROID_VERSION),"FROYO")
- LOCAL_SHARED_LIBRARIES += libicuuc 
- LOCAL_C_INCLUDES += external/icu4c/common
- endif
- 
- LOCAL_CFLAGS := -DHAVE_CONFIG_H       -DGSTREAMER_BUILT_FOR_ANDROID
+ LOCAL_CFLAGS := -DHAVE_CONFIG_H       -DGSTREAMER_BUILT_FOR_ANDROID \
+       $(GST_PLUGINS_BASE_CFLAGS)
  #
  # define LOCAL_PRELINK_MODULE to false to not use pre-link map
  #

diff --cc android/pbutils.mk
index 30d624c,a9aebac..52ca383
--- 1/android/pbutils.mk
--- 2/android/pbutils.mk
+++ b/android/pbutils.mk
@@@ -1,7 -1,9 +1,9 @@@
  LOCAL_PATH:= $(call my-dir)
- #----------------------------------------
- # include 
+ include $(CLEAR_VARS)
+ 
+ GST_PBUTILS_DIR := gst-libs/gst/pbutils/
+ 
 -gst_pbutils_COPY_HEADERS_TO := gstreamer-0.10/gst/pbutils
 +gst_pbutils_COPY_HEADERS_TO := gstreamer-0.11/gst/pbutils
  gst_pbutils_COPY_HEADERS_BASE := \
        gst-libs/gst/pbutils/descriptions.h \
        gst-libs/gst/pbutils/install-plugins.h \
@@@ -18,46 -18,44 +18,44 @@@ gst_pbutils_COPY_HEADERS := $(addprefi
  
  LOCAL_ARM_MODE := arm
  
- pbutils_LOCAL_SRC_FILES_BASE:= \
-       gst-libs/gst/pbutils/pbutils.c \
-       gst-libs/gst/pbutils/descriptions.c \
-       gst-libs/gst/pbutils/install-plugins.c \
-       gst-libs/gst/pbutils/missing-plugins.c 
- pbutils_LOCAL_SRC_FILES_ANDROID:= \
-       gst-libs/gst/pbutils/pbutils-enumtypes.c
+ BUILT_SOURCES = \
+       pbutils-enumtypes.c \
+       pbutils-enumtypes.h \
+       pbutils-marshal.c   \
+       pbutils-marshal.h
+ 
+ LOCAL_SRC_FILES := \
+       gstpluginsbaseversion.c \
+       pbutils.c               \
+       codec-utils.c           \
+       descriptions.c          \
+       encoding-profile.c      \
+       encoding-target.c       \
+       install-plugins.c       \
+       missing-plugins.c       \
+       gstdiscoverer.c         \
+       gstdiscoverer-types.c   \
+       pbutils-enumtypes.c     \
+       pbutils-marshal.c
+ 
+ LOCAL_SRC_FILES := $(addprefix ../$(GST_PBUTILS_DIR),$(LOCAL_SRC_FILES))
+ 
+ $(BUILT_SOURCES):
+       make -C $(GST_PLUGINS_BASE_TOP)/$(GST_PBUTILS_DIR) $@
  
- LOCAL_SRC_FILES:= $(addprefix ../,$(pbutils_LOCAL_SRC_FILES_BASE)) \
-                                 $(addprefix ../android/,$(pbutils_LOCAL_SRC_FILES_ANDROID))
  
  LOCAL_SHARED_LIBRARIES := \
 -    libgstvideo-0.10        \
 -    libgstreamer-0.10       \
 -    libgstbase-0.10         \
++    libgstvideo-0.11        \
 +    libgstreamer-0.11       \
 +    libgstbase-0.11         \
      libglib-2.0             \
      libgthread-2.0          \
      libgmodule-2.0          \
      libgobject-2.0                    
  
 -LOCAL_MODULE:= libgstpbutils-0.10
 +LOCAL_MODULE:= libgstpbutils-0.11
- 
- LOCAL_C_INCLUDES := \
-     $(LOCAL_PATH)/../gst-libs/gst/pbutils     \
-     $(LOCAL_PATH)/../gst-libs                 \
-     $(LOCAL_PATH)/..                                  \
-     $(LOCAL_PATH)                                                     \
-       $(LOCAL_PATH)/gst-libs/gst/pbutils      \
-     $(TARGET_OUT_HEADERS)/gstreamer-0.11    \
-       $(TARGET_OUT_HEADERS)/glib-2.0                  \
-     $(TARGET_OUT_HEADERS)/glib-2.0/glib     \
-       external/libxml2/include
- 
- 
- ifeq ($(STECONF_ANDROID_VERSION),"FROYO")
- LOCAL_SHARED_LIBRARIES += libicuuc 
- LOCAL_C_INCLUDES += external/icu4c/common
- endif
- 
- LOCAL_CFLAGS := -DHAVE_CONFIG_H       -DGSTREAMER_BUILT_FOR_ANDROID
+ LOCAL_CFLAGS := -DGSTREAMER_BUILT_FOR_ANDROID \
+       $(GST_PLUGINS_BASE_CFLAGS)
  #
  # define LOCAL_PRELINK_MODULE to false to not use pre-link map
  #

diff --cc android/playbin.mk
index a0ef2d7,e792429..b81bf9e
--- 1/android/playbin.mk
--- 2/android/playbin.mk
+++ b/android/playbin.mk
@@@ -11,20 -10,17 +10,17 @@@ playbin_LOCAL_SRC_FILES_BASE:= 
        gst/playback/gstplaysink.c \
        gst/playback/gstplaybasebin.c \
        gst/playback/gstplay-enum.c \
-       gst/playback/gstfactorylists.c \
-       gst/playback/gstscreenshot.c \
        gst/playback/gststreaminfo.c \
        gst/playback/gststreamselector.c \
-       gst/playback/gstsubtitleoverlay.c
- playbin_LOCAL_SRC_FILES_ANDROID:= \
+       gst/playback/gstsubtitleoverlay.c \
+       gst/playback/gststreamsynchronizer.c \
        gst/playback/gstplay-marshal.c
  
- LOCAL_SRC_FILES:= $(addprefix ../,$(playbin_LOCAL_SRC_FILES_BASE)) \
-                                 $(addprefix ../android/,$(playbin_LOCAL_SRC_FILES_ANDROID))
+ LOCAL_SRC_FILES:= $(addprefix ../,$(playbin_LOCAL_SRC_FILES_BASE))
  
  LOCAL_SHARED_LIBRARIES := \
 -    libgstreamer-0.10       \
 -    libgstbase-0.10         \
 +    libgstreamer-0.11       \
 +    libgstbase-0.11         \
      libglib-2.0             \
      libgthread-2.0          \
      libgmodule-2.0          \
@@@ -58,7 -38,8 +38,8 @@@ LOCAL_CFLAGS := -DHAVE_CONFIG_H        -DGSTR
  #
  LOCAL_PRELINK_MODULE := false
  
 -#It's a gstreamer plugins, and it must be installed on ..../lib/gstreamer-0.10
 -LOCAL_MODULE_PATH := $(TARGET_OUT)/lib/gstreamer-0.10
 +#It's a gstreamer plugins, and it must be installed on ..../lib/gstreamer-0.11
 +LOCAL_MODULE_PATH := $(TARGET_OUT)/lib/gstreamer-0.11
+ LOCAL_MODULE_TAGS := optional
  
  include $(BUILD_SHARED_LIBRARY)

diff --cc android/queue2.mk
Simple merge

diff --cc android/riff.mk
index c557cb2,759bdad..958235b
--- 1/android/riff.mk
--- 2/android/riff.mk
+++ b/android/riff.mk
@@@ -25,29 -25,14 +25,14 @@@ LOCAL_SHARED_LIBRARIES := 
      libgthread-2.0          \
      libgmodule-2.0          \
      libgobject-2.0                    \
 -      libgsttag-0.10          \
 -    libgstaudio-0.10     
 +      libgsttag-0.11          \
 +    libgstaudio-0.11     
  
  
 -LOCAL_MODULE:= libgstriff-0.10
 +LOCAL_MODULE:= libgstriff-0.11
  
- LOCAL_C_INCLUDES := \
-     $(LOCAL_PATH)/../gst-libs/gst/riff  \
-     $(LOCAL_PATH)/../gst-libs                         \
-     $(LOCAL_PATH)/..                          \
-     $(LOCAL_PATH)                                     \
-       $(LOCAL_PATH)/gst/tcp                           \
-     $(TARGET_OUT_HEADERS)/gstreamer-0.11 \
-       $(TARGET_OUT_HEADERS)/glib-2.0          \
-     $(TARGET_OUT_HEADERS)/glib-2.0/glib \
-       external/libxml2/include
- 
- ifeq ($(STECONF_ANDROID_VERSION),"FROYO")
- LOCAL_SHARED_LIBRARIES += libicuuc 
- LOCAL_C_INCLUDES += external/icu4c/common
- endif
- 
- LOCAL_CFLAGS := -DHAVE_CONFIG_H        -DGSTREAMER_BUILT_FOR_ANDROID
+ LOCAL_CFLAGS := -DHAVE_CONFIG_H        -DGSTREAMER_BUILT_FOR_ANDROID \
+       $(GST_PLUGINS_BASE_CFLAGS)
  #
  # define LOCAL_PRELINK_MODULE to false to not use pre-link map
  #

diff --cc android/rtp.mk
index 573e846,7ad0071..f39f86c
--- 1/android/rtp.mk
--- 2/android/rtp.mk
+++ b/android/rtp.mk
@@@ -33,25 -33,9 +33,9 @@@ LOCAL_SHARED_LIBRARIES := 
      libgmodule-2.0          \
      libgobject-2.0            
  
 -LOCAL_MODULE:= libgstrtp-0.10
 +LOCAL_MODULE:= libgstrtp-0.11
- 
- LOCAL_C_INCLUDES := \
-     $(LOCAL_PATH)/../gst-libs/gst/rtp   \
-     $(LOCAL_PATH)/../gst-libs                 \
-     $(LOCAL_PATH)/../                                 \
-     $(LOCAL_PATH)                                     \
-       $(LOCAL_PATH)/gst/tcp                           \
-     $(TARGET_OUT_HEADERS)/gstreamer-0.11 \
-       $(TARGET_OUT_HEADERS)/glib-2.0          \
-     $(TARGET_OUT_HEADERS)/glib-2.0/glib \
-       external/libxml2/include
- 
- ifeq ($(STECONF_ANDROID_VERSION),"FROYO")
- LOCAL_SHARED_LIBRARIES += libicuuc 
- LOCAL_C_INCLUDES += external/icu4c/common
- endif
- 
- LOCAL_CFLAGS := -DHAVE_CONFIG_H       -DGSTREAMER_BUILT_FOR_ANDROID
+ LOCAL_CFLAGS := -DHAVE_CONFIG_H       -DGSTREAMER_BUILT_FOR_ANDROID \
+       $(GST_PLUGINS_BASE_CFLAGS)
  #
  # define LOCAL_PRELINK_MODULE to false to not use pre-link map
  #

diff --cc android/rtsp.mk
index cb14ca3,fdc07b9..4f61f4e
--- 1/android/rtsp.mk
--- 2/android/rtsp.mk
+++ b/android/rtsp.mk
@@@ -34,36 -31,20 +31,20 @@@ rtsp_LOCAL_SRC_FILES_BASE:= 
        gst-libs/gst/rtsp/gstrtsp-marshal.c \
        gst-libs/gst/rtsp/gstrtsp-enumtypes.c
  
- LOCAL_SRC_FILES:= $(addprefix ../,$(rtsp_LOCAL_SRC_FILES_BASE)) \
-                                 $(addprefix ../android/,$(rtsp_LOCAL_SRC_FILES_ANDROID))
+ LOCAL_SRC_FILES:= $(addprefix ../,$(rtsp_LOCAL_SRC_FILES_BASE))
  
  LOCAL_SHARED_LIBRARIES := \
 -    libgstreamer-0.10       \
 -    libgstbase-0.10         \
 +    libgstreamer-0.11       \
 +    libgstbase-0.11         \
      libglib-2.0             \
      libgthread-2.0          \
      libgmodule-2.0          \
      libgobject-2.0
  
 -LOCAL_MODULE:= libgstrtsp-0.10
 +LOCAL_MODULE:= libgstrtsp-0.11
  
- LOCAL_C_INCLUDES := \
-     $(LOCAL_PATH)/../gst-libs/gst/rtsp  \
-     $(LOCAL_PATH)/../gst-libs           \
-     $(LOCAL_PATH)/..                          \
-     $(LOCAL_PATH)                                             \
-       $(LOCAL_PATH)/gst-libs/gst/rtsp     \
-     $(TARGET_OUT_HEADERS)/gstreamer-0.11 \
-       $(TARGET_OUT_HEADERS)/glib-2.0          \
-     $(TARGET_OUT_HEADERS)/glib-2.0/glib \
-       external/libxml2/include
- 
- ifeq ($(STECONF_ANDROID_VERSION),"FROYO")
- LOCAL_SHARED_LIBRARIES += libicuuc 
- LOCAL_C_INCLUDES += external/icu4c/common
- endif
- 
- LOCAL_CFLAGS := -DHAVE_CONFIG_H -DINET_ADDRSTRLEN=16 -DGSTREAMER_BUILT_FOR_ANDROID   
+ LOCAL_CFLAGS := -DHAVE_CONFIG_H -DINET_ADDRSTRLEN=16 -DGSTREAMER_BUILT_FOR_ANDROID \
+       $(GST_PLUGINS_BASE_CFLAGS)
  #
  # define LOCAL_PRELINK_MODULE to false to not use pre-link map
  #

diff --cc android/sdp.mk
index ced65da,b83002c..7d0e7e8
--- 1/android/sdp.mk
--- 2/android/sdp.mk
+++ b/android/sdp.mk
@@@ -23,25 -23,9 +23,9 @@@ LOCAL_SHARED_LIBRARIES := 
      libgmodule-2.0          \
      libgobject-2.0
  
 -LOCAL_MODULE:= libgstsdp-0.10
 +LOCAL_MODULE:= libgstsdp-0.11
- 
- LOCAL_C_INCLUDES := \
-     $(LOCAL_PATH)/../gst-libs/gst/sdp         \
-     $(LOCAL_PATH)/../gst-libs                         \
-     $(LOCAL_PATH)/..                          \
-     $(LOCAL_PATH)                                     \
-       $(LOCAL_PATH)/gst/tcp                           \
-     $(TARGET_OUT_HEADERS)/gstreamer-0.11 \
-       $(TARGET_OUT_HEADERS)/glib-2.0          \
-     $(TARGET_OUT_HEADERS)/glib-2.0/glib \
-       external/libxml2/include 
- 
- ifeq ($(STECONF_ANDROID_VERSION),"FROYO")
- LOCAL_SHARED_LIBRARIES += libicuuc 
- LOCAL_C_INCLUDES += external/icu4c/common
- endif
- 
- LOCAL_CFLAGS := -DHAVE_CONFIG_H  -DGSTREAMER_BUILT_FOR_ANDROID
+ LOCAL_CFLAGS := -DHAVE_CONFIG_H  -DGSTREAMER_BUILT_FOR_ANDROID \
+       $(GST_PLUGINS_BASE_CFLAGS)
  #
  # define LOCAL_PRELINK_MODULE to false to not use pre-link map
  #

diff --cc android/tag.mk
index 8c5743f,e4eaee6..7ca9081
--- 1/android/tag.mk
--- 2/android/tag.mk
+++ b/android/tag.mk
@@@ -27,25 -29,11 +29,10 @@@ LOCAL_SHARED_LIBRARIES := 
      libgmodule-2.0          \
      libgobject-2.0
  
 -LOCAL_MODULE:= libgsttag-0.10
 -
 +LOCAL_MODULE:= libgsttag-0.11
  
- LOCAL_C_INCLUDES := \
-     $(LOCAL_PATH)/../gst/tag                                  \
-     $(LOCAL_PATH)/../gst-libs                                 \
-     $(LOCAL_PATH)/..                                  \
-       $(LOCAL_PATH)                                                   \
-     $(TARGET_OUT_HEADERS)/gstreamer-0.11    \
-       $(TARGET_OUT_HEADERS)/glib-2.0                  \
-     $(TARGET_OUT_HEADERS)/glib-2.0/glib     \
-       external/libxml2/include
- 
- ifeq ($(STECONF_ANDROID_VERSION),"FROYO")
- LOCAL_SHARED_LIBRARIES += libicuuc 
- LOCAL_C_INCLUDES += external/icu4c/common
- endif
- 
- 
- LOCAL_CFLAGS := -DHAVE_CONFIG_H       -DGSTREAMER_BUILT_FOR_ANDROID
+ LOCAL_CFLAGS := -DHAVE_CONFIG_H       -DGSTREAMER_BUILT_FOR_ANDROID \
+       $(GST_PLUGINS_BASE_CFLAGS)
  #
  # define LOCAL_PRELINK_MODULE to false to not use pre-link map
  #

diff --cc android/tcp.mk
index ce0b619,28f1dca..a4d6aa8
--- 1/android/tcp.mk
--- 2/android/tcp.mk
+++ b/android/tcp.mk
@@@ -16,12 -15,11 +15,11 @@@ tcp_LOCAL_SRC_FILES_BASE:= 
        gst/tcp/gsttcp-enumtypes.c      \
        gst/tcp/gsttcp-marshal.c
  
- LOCAL_SRC_FILES:= $(addprefix ../,$(tcp_LOCAL_SRC_FILES_BASE)) \
-                                 $(addprefix ../android/,$(tcp_LOCAL_SRC_FILES_ANDROID))
+ LOCAL_SRC_FILES:= $(addprefix ../,$(tcp_LOCAL_SRC_FILES_BASE))
  
  LOCAL_SHARED_LIBRARIES := \
 -    libgstreamer-0.10       \
 -    libgstbase-0.10         \
 +    libgstreamer-0.11       \
 +    libgstbase-0.11         \
      libglib-2.0             \
      libgthread-2.0          \
      libgmodule-2.0          \
@@@ -52,7 -35,8 +35,8 @@@ LOCAL_CFLAGS := -DHAVE_CONFIG_H  -DGSTR
  #
  LOCAL_PRELINK_MODULE := false
  
 -#It's a gstreamer plugins, and it must be installed on ..../lib/gstreamer-0.10
 -LOCAL_MODULE_PATH := $(TARGET_OUT)/lib/gstreamer-0.10
 +#It's a gstreamer plugins, and it must be installed on ..../lib/gstreamer-0.11
 +LOCAL_MODULE_PATH := $(TARGET_OUT)/lib/gstreamer-0.11
+ LOCAL_MODULE_TAGS := optional
  
  include $(BUILD_SHARED_LIBRARY)

diff --cc android/typefindfunctions.mk
index eb49a9d,2650e2b..c1c267c
--- 1/android/typefindfunctions.mk
--- 2/android/typefindfunctions.mk
+++ b/android/typefindfunctions.mk
@@@ -10,8 -10,9 +10,9 @@@ typefindfunctions_LOCAL_SRC_FILES:= 
  LOCAL_SRC_FILES:= $(addprefix ../,$(typefindfunctions_LOCAL_SRC_FILES))
  
  LOCAL_SHARED_LIBRARIES := \
 -    libgstreamer-0.10       \
 -    libgstbase-0.10         \
 -    libgstpbutils-0.10            \
 +    libgstreamer-0.11       \
 +    libgstbase-0.11         \
++    libgstpbutils-0.11            \
      libglib-2.0             \
      libgthread-2.0          \
      libgmodule-2.0          \
@@@ -41,7 -27,8 +27,8 @@@ LOCAL_CFLAGS := -DHAVE_CONFIG_H        -DGSTR
  #
  LOCAL_PRELINK_MODULE := false
  
 -#It's a gstreamer plugins, and it must be installed on ..../lib/gstreamer-0.10
 -LOCAL_MODULE_PATH := $(TARGET_OUT)/lib/gstreamer-0.10
 +#It's a gstreamer plugins, and it must be installed on ..../lib/gstreamer-0.11
 +LOCAL_MODULE_PATH := $(TARGET_OUT)/lib/gstreamer-0.11
+ LOCAL_MODULE_TAGS := optional
  
  include $(BUILD_SHARED_LIBRARY)

diff --cc android/video.mk
index 15093d5,fdfb6a2..f92949a
--- 1/android/video.mk
--- 2/android/video.mk
+++ b/android/video.mk
@@@ -20,40 -17,24 +17,24 @@@ LOCAL_ARM_MODE := ar
  video_LOCAL_SRC_FILES_BASE:= \
        gst-libs/gst/video/video.c \
        gst-libs/gst/video/gstvideosink.c \
-       gst-libs/gst/video/gstvideofilter.c     
- video_LOCAL_SRC_FILES_ANDROID:= \
+       gst-libs/gst/video/gstvideofilter.c \
+       gst-libs/gst/video/convertframe.c \
        gst-libs/gst/video/video-enumtypes.c
     
- LOCAL_SRC_FILES:= $(addprefix ../,$(video_LOCAL_SRC_FILES_BASE)) \
-                                 $(addprefix ../android/,$(video_LOCAL_SRC_FILES_ANDROID))
+ LOCAL_SRC_FILES:= $(addprefix ../,$(video_LOCAL_SRC_FILES_BASE))
  
  LOCAL_SHARED_LIBRARIES := \
 -    libgstreamer-0.10       \
 -    libgstbase-0.10         \
 +    libgstreamer-0.11       \
 +    libgstbase-0.11         \
      libglib-2.0             \
      libgthread-2.0          \
      libgmodule-2.0          \
      libgobject-2.0
  
 -LOCAL_MODULE:= libgstvideo-0.10
 +LOCAL_MODULE:= libgstvideo-0.11
  
- LOCAL_C_INCLUDES := \
-     $(LOCAL_PATH)/../gst-libs/gst/video  \
-     $(LOCAL_PATH)/../gst-libs                 \
-     $(LOCAL_PATH)/..                          \
-     $(LOCAL_PATH)                                             \
-       $(LOCAL_PATH)/gst-libs/gst/video    \
-     $(TARGET_OUT_HEADERS)/gstreamer-0.11 \
-       $(TARGET_OUT_HEADERS)/glib-2.0           \
-     $(TARGET_OUT_HEADERS)/glib-2.0/glib  \
-       external/libxml2/include
- 
- ifeq ($(STECONF_ANDROID_VERSION),"FROYO")
- LOCAL_SHARED_LIBRARIES += libicuuc 
- LOCAL_C_INCLUDES += external/icu4c/common
- endif
- 
- LOCAL_CFLAGS := -DHAVE_CONFIG_H       -DGSTREAMER_BUILT_FOR_ANDROID
+ LOCAL_CFLAGS := -DHAVE_CONFIG_H       -DGSTREAMER_BUILT_FOR_ANDROID \
+       $(GST_PLUGINS_BASE_CFLAGS)
  #
  # define LOCAL_PRELINK_MODULE to false to not use pre-link map
  #

diff --cc ext/vorbis/gstvorbisdec.c
Simple merge

diff --cc gst-libs/gst/app/Makefile.am
Simple merge

diff --cc gst-libs/gst/rtp/gstbasertpdepayload.c
Simple merge

diff --cc gst-libs/gst/rtp/gstbasertppayload.c
Simple merge

diff --cc gst/audioresample/gstaudioresample.c
Simple merge