From: Eunhae Choi <eunhae1.choi@samsung.com>
Date: Wed, 25 Nov 2015 07:30:36 +0000 (+0900)
Subject: Merge remote-tracking branch 'remotes/origin/upstream/1.6' into tizen
X-Git-Tag: submit/tizen/20151127.020604~1
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e4ef1e56c79726be607b03216d4ca87d6823c7a6;p=platform%2Fupstream%2Fgstreamer.git

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

Change-Id: If2672ddd4ea2935a86bd3a519d5d5345df0d0f9a
---

e4ef1e56c79726be607b03216d4ca87d6823c7a6
diff --cc RELEASE
index d66082cb0f,b4faf6c63c..d4c889b0e0
--- a/RELEASE
+++ b/RELEASE
@@@ -1,28 -1,20 +1,26 @@@
  
- Release notes for GStreamer 1.4.1
+ Release notes for GStreamer 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, gstreamer, only contains core functionality.
diff --cc gst/Makefile.am
index a669f6ddc2,213e3fda59..ba269de20e
--- a/gst/Makefile.am
+++ b/gst/Makefile.am
@@@ -147,13 -151,8 +151,14 @@@ libgstreamer_@GST_API_VERSION@_la_LIBAD
  	$(GST_PRINTF_LA)				\
  	$(GST_ALL_LIBS)					\
  	$(WIN32_LIBS)					\
+ 	$(SOCKET_LIBS)					\
  	$(LIBM)
 +if USE_DLOG
 +libgstreamer_@GST_API_VERSION@_la_CFLAGS += $(DLOG_CFLAGS)
 +libgstreamer_@GST_API_VERSION@_la_LIBADD += $(DLOG_LIBS)
 +libgstreamer_@GST_API_VERSION@_la_CFLAGS += -DUSE_DLOG
 +endif
 +
  
  libgstreamer_@GST_API_VERSION@_la_LDFLAGS =		\
  	$(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS) $(GST_LT_LDFLAGS)
diff --cc plugins/elements/gstqueue2.c
index d698f40599,656066e617..d9dd0691bf
--- a/plugins/elements/gstqueue2.c
+++ b/plugins/elements/gstqueue2.c
@@@ -952,23 -942,10 +953,15 @@@ static voi
  update_buffering (GstQueue2 * queue)
  {
    gint percent;
- #ifdef GST_QUEUE2_MODIFICATION
-   GstQueue2Range *range;
- 
-   if (queue->read)
-     range = queue->read;
-   else
-     range = queue->current;
- #endif
  
    /* Ensure the variables used to calculate buffering state are up-to-date. */
 +#ifdef GST_QUEUE2_MODIFICATION
 +  if (range)
 +    update_cur_level (queue, range);
 +#else
    if (queue->current)
      update_cur_level (queue, queue->current);
 +#endif
    update_in_rates (queue);
  
    if (!get_buffering_percent (queue, NULL, &percent))