Merge remote-tracking branch 'remotes/origin/upstream/1.6' into tizen

Change-Id: If30239008ea7e89207ddc42df363724555dc9d55

diff --cc .gitignore
Simple merge

diff --cc RELEASE
index 0c6958a,d68c310..b6667f3
--- 1/RELEASE
--- 2/RELEASE
+++ b/RELEASE
@@@ -1,28 -1,20 +1,26 @@@
  
- Release notes for GStreamer Base Plugins 1.4.1
+ Release notes for GStreamer Base Plugins 1.6.1
  
  
- The GStreamer team is pleased to announce a bugfix release of the stable
- 1.4 release series. The 1.4 release series is adding new features on top
- of the 1.2 series and is part of the API and ABI-stable 1.x release
- series of the GStreamer multimedia framework that contains new features.
- The 1.4.x bugfix releases only contain important bugfixes compared to 1.4.0.
+ The GStreamer team is proud to announce the first bugfix release in the stable
+ 1.6 release series of your favourite cross-platform multimedia framework!
  
  
 +Binaries for Android, iOS, Mac OS X and Windows are provided by the
 +GStreamer project for this release.
  
+ This release only contains bugfixes and it is safe to update from 1.6.0. For a
+ full list of bugfixes see Bugzilla.
  
 +The 1.x series is a stable series targeted at end users. It is not API
 +or ABI compatible with the 0.10.x series. It can, however, be installed
 +in parallel with the 0.10.x series and will not affect an existing
 +0.10.x installation.
  
  
- The stable 1.4.x release series is API and ABI compatible with 1.0.x and
- any other 1.x release series in the future. Compared to 1.0.x it contains
- some new features and more intrusive changes that were considered too
- risky as a bugfix.
+ See http://gstreamer.freedesktop.org/releases/1.6/
+ for the full release notes.
+ 
  
  
  This module contains a set of reference plugins, base classes for other

diff --cc configure.ac
Simple merge

diff --cc gst/typefind/gsttypefindfunctions.c
index 676f250,2bedf18..d3a3415
--- 1/gst/typefind/gsttypefindfunctions.c
--- 2/gst/typefind/gsttypefindfunctions.c
+++ b/gst/typefind/gsttypefindfunctions.c
@@@ -5598,15 -5640,14 +5706,17 @@@ plugin_init (GstPlugin * plugin
        hls_type_find, "m3u8", HLS_CAPS, NULL, NULL);
    TYPE_FIND_REGISTER (plugin, "application/sdp", GST_RANK_SECONDARY,
        sdp_type_find, "sdp", SDP_CAPS, NULL, NULL);
 +#ifndef GST_EXT_MIME_TYPES
    TYPE_FIND_REGISTER (plugin, "application/smil", GST_RANK_SECONDARY,
        smil_type_find, "smil", SMIL_CAPS, NULL, NULL);
+   TYPE_FIND_REGISTER (plugin, "application/ttml+xml", GST_RANK_SECONDARY,
+       ttml_xml_type_find, "ttml+xml", TTML_XML_CAPS, NULL, NULL);
    TYPE_FIND_REGISTER (plugin, "application/xml", GST_RANK_MARGINAL,
        xml_type_find, "xml", GENERIC_XML_CAPS, NULL, NULL);
 +#endif
    TYPE_FIND_REGISTER_RIFF (plugin, "audio/x-wav", GST_RANK_PRIMARY, "wav",
        "WAVE");
 +#ifndef GST_EXT_MIME_TYPES
    TYPE_FIND_REGISTER (plugin, "audio/x-aiff", GST_RANK_SECONDARY,
        aiff_type_find, "aiff,aif,aifc", AIFF_CAPS, NULL, NULL);
    TYPE_FIND_REGISTER (plugin, "audio/x-svx", GST_RANK_SECONDARY, svx_type_find,