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

Change-Id: I9cc7b5a7496dde5fd0f5ae4183be6d3c0b5f02f5

diff --cc .gitignore
Simple merge

diff --cc RELEASE
index a59841d,3da15c5..3bd3f2d
--- 1/RELEASE
--- 2/RELEASE
+++ b/RELEASE
@@@ -1,28 -1,19 +1,25 @@@
  
- Release notes for GStreamer Good Plugins 1.4.1
+ Release notes for GStreamer Good 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.
  
  
  

diff --cc configure.ac
Simple merge

diff --cc ext/pulse/pulsesink.c
Simple merge

diff --cc ext/pulse/pulsesrc.c
index 28dd821,6658654..ee8b572
--- 1/ext/pulse/pulsesrc.c
--- 2/ext/pulse/pulsesrc.c
+++ b/ext/pulse/pulsesrc.c
@@@ -59,10 -59,10 +59,13 @@@ GST_DEBUG_CATEGORY_EXTERN (pulse_debug)
  #define DEFAULT_VOLUME          1.0
  #define DEFAULT_MUTE            FALSE
  #define MAX_VOLUME              10.0
 +#ifdef __TIZEN__
 +#define DEFAULT_AUDIO_LATENCY   "mid"
 +#endif /* __TIZEN__ */
  
+ /* See the pulsesink code for notes on how we interact with the PA mainloop
+  * thread. */
+ 
  enum
  {
    PROP_0,

diff --cc ext/pulse/pulseutil.c
Simple merge

diff --cc sys/v4l2/v4l2_calls.c
Simple merge