Release 1.10.41.10.4

5 files changed, 80 insertions, 11 deletions

diff --git a/ChangeLog b/ChangeLog
index 59f78f6d..b93b1bc6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,9 +1,40 @@
+=== release 1.10.4 ===
+
+2017-02-23  Sebastian Dröge <slomo@coaxion.net>
+
+	* configure.ac:
+	  releasing 1.10.4
+
+2016-11-23 18:42:27 +0200  Sebastian Dröge <sebastian@centricular.com>
+
+	* ges/ges-timeline.c:
+	  ges-timeline: Properly calculate absolute diff of two unsigned integers
+	  CID 1394491.
+
+2016-11-23 18:28:35 +0200  Sebastian Dröge <sebastian@centricular.com>
+
+	* ges/ges.c:
+	  ges: Add NULL check before dereferencing
+	  CID 1394494.
+
+2016-11-15 15:09:10 -0300  Thibault Saunier <thibault.saunier@osg.samsung.com>
+
+	* ges/ges-uri-asset.c:
+	* ges/ges.c:
+	  ges: Check if GstDiscoverer could be created at init time
+	  And fail initialization if it is not the case, we make the assumption
+	  it worked all around the codebase so we should really concider it fatal.
+
 === release 1.10.3 ===
 
-2017-01-30  Sebastian Dröge <slomo@coaxion.net>
+2017-01-30 16:29:03 +0200  Sebastian Dröge <sebastian@centricular.com>
 
+	* ChangeLog:
+	* NEWS:
+	* RELEASE:
 	* configure.ac:
-	  releasing 1.10.3
+	* gst-editing-services.doap:
+	  Release 1.10.3
 
 2016-12-22 08:44:07 -0300  Thibault Saunier <thibault.saunier@osg.samsung.com>
 
diff --git a/NEWS b/NEWS
index c8f4d44a..a2044247 100644
--- a/NEWS
+++ b/NEWS
@@ -1,8 +1,8 @@
 # GStreamer 1.10 Release Notes
 
 GStreamer 1.10.0 was originally released on 1st November 2016.
-The latest bug-fix release in the 1.10 series is [1.10.3](#1.10.3) and was
-released on 30 January 2017.
+The latest bug-fix release in the 1.10 series is [1.10.4](#1.10.4) and was
+released on 23 February 2017.
 
 The GStreamer team is proud to announce a new major feature release in the
 stable 1.x API series of your favourite cross-platform multimedia framework!
@@ -13,7 +13,7 @@ improvements.
 See [https://gstreamer.freedesktop.org/releases/1.10/][latest] for the latest
 version of this document.
 
-*Last updated: Monday 30 Jan 2017, 12:00 UTC [(log)][gitlog]*
+*Last updated: Thursday 23 Feb 2017, 15:00 UTC [(log)][gitlog]*
 
 [latest]: https://gstreamer.freedesktop.org/releases/1.10/
 [gitlog]: https://cgit.freedesktop.org/gstreamer/www/log/src/htdocs/releases/1.10/release-notes-1.10.md
@@ -1136,10 +1136,13 @@ This release only contains bugfixes and it should be safe to update from 1.10.x.
 #### Major bugfixes in 1.10.3
 
  - Various fixes for crashes, assertions, deadlocks and memory leaks on fuzzed
-   input files and in other situations
+   input files and in other situations (CVE-2016-10198, CVE-2016-10199,
+   CVE-2017-5837, CVE-2017-5838, CVE-2017-5839, CVE-2017-5840, CVE-2017-5841,
+   CVE-2017-5842, CVE-2017-5843, CVE-2017-5844, CVE-2017-5845, CVE-2017-5846)
  - Regression fixes for souphttpsrc with redirection tracking and retrying
  - Regression fix for gst-rtsp-server not handling TCP-only medias anymore
  - Various other bugfixes the RTP/RTSP codebase
+ - Fix for gmodule on 64 bit Android, it was never working before there
  - vp8enc works again on 32 bit Windows
  - Fixes to Opus PLC handling in the decoder
  - Fix for stream corruption in multihandlesink when removing clients
@@ -1152,6 +1155,32 @@ GIT logs or ChangeLogs of the particular modules.
 
 [buglist-1.10.3]: https://bugzilla.gnome.org/buglist.cgi?bug_status=RESOLVED&bug_status=VERIFIED&classification=Platform&limit=0&list_id=187054&order=bug_id&product=GStreamer&query_format=advanced&resolution=FIXED&target_milestone=1.10.3
 
+<a name="1.10.4"></a>
+
+### 1.10.4
+
+The third 1.10 bug-fix release (1.10.4) was released on 23 February 2017.
+This release only contains bugfixes and it should be safe to update from 1.10.x.
+
+#### Major bugfixes in 1.10.4
+
+ - Various fixes for crashes, assertions, deadlocks and memory leaks on fuzzed
+   input files and in other situations (CVE-2017-5847, CVE-2017-5848)
+ - More regression fixes for souphttpsrc redirection tracking
+ - Regression fix for gmodule on 32 bit Android, which was introduced as part
+   of the 64 bit Android fix in 1.10.3 and broke the androidmedia plugin
+ - Various bugfixes for regressions and other problems in the V4L2 plugin
+ - Fix for 5.1, 6.1 and 7.1 channel layouts for Vorbis
+ - Fixes for timestamp generation of Android video encoder element
+ - gst-libav was updated to ffmpeg 3.2.4, fixing a couple of CVEs
+ - ... and many, many more!
+
+For a full list of bugfixes see [Bugzilla][buglist-1.10.4]. Note that this is
+not the full list of changes. For the full list of changes please refer to the
+GIT logs or ChangeLogs of the particular modules.
+
+[buglist-1.10.4]: https://bugzilla.gnome.org/buglist.cgi?bug_status=RESOLVED&bug_status=VERIFIED&classification=Platform&limit=0&list_id=187054&order=bug_id&product=GStreamer&query_format=advanced&resolution=FIXED&target_milestone=1.10.4
+
 ## Known Issues
 
 - iOS builds with iOS 6 SDK and old C++ STL. You need to select iOS 6 instead
@@ -1185,4 +1214,3 @@ Müller, Reynaldo H. Verdejo Pinochet, Arun Raghavan, Thibault Saunier,
 Jan Schmidt, Wim Taymans, Matthew Waters*
 
 *License: [CC BY-SA 4.0](http://creativecommons.org/licenses/by-sa/4.0/)*
-
diff --git a/RELEASE b/RELEASE
index 93f17e70..fe5329c7 100644
--- a/RELEASE
+++ b/RELEASE
@@ -1,7 +1,7 @@
 
-Release notes for GStreamer Editing Services 1.10.3
+Release notes for GStreamer Editing Services 1.10.4
 
-The GStreamer team is proud to announce the third bugfix release in the stable
+The GStreamer team is proud to announce the fourth bugfix release in the stable
 1.10 release series of your favourite cross-platform multimedia framework!
 
 
@@ -48,5 +48,6 @@ subscribe to the gstreamer-devel list.
         
 Contributors to this release
     
+      * Sebastian Dröge
       * Thibault Saunier
  
\ No newline at end of file
diff --git a/configure.ac b/configure.ac
index c63147a7..bfdc40c8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,7 @@ AC_PREREQ(2.62)
 dnl initialize autoconf
 dnl when going to/from release please set the nano (fourth number) right !
 dnl releases only do Wall, cvs and prerelease does Werror too
-AC_INIT(GStreamer Editing Services, 1.10.3,
+AC_INIT(GStreamer Editing Services, 1.10.4,
     http://bugzilla.gnome.org/enter_bug.cgi?product=GStreamer,
     gstreamer-editing-services)
 
@@ -51,7 +51,7 @@ dnl we override it here if we need to for the release candidate of new series
 GST_API_VERSION=1.0
 AC_SUBST(GST_API_VERSION)
 
-AS_LIBTOOL(GST, 1003, 0, 1003)
+AS_LIBTOOL(GST, 1004, 0, 1004)
 
 dnl *** required versions of GStreamer stuff ***
 GST_REQ=1.10.0
diff --git a/gst-editing-services.doap b/gst-editing-services.doap
index e8c4a1e1..bd177f40 100644
--- a/gst-editing-services.doap
+++ b/gst-editing-services.doap
@@ -32,6 +32,15 @@ GStreamer library for creating audio and video editors
 
  <release>
   <Version>
+   <revision>1.10.4</revision>
+   <branch>1.10</branch>
+   <created>2017-02-23</created>
+   <file-release rdf:resource="http://gstreamer.freedesktop.org/src/gst-editing-services/gst-editing-services-1.10.4.tar.xz" />
+  </Version>
+ </release>
+
+ <release>
+  <Version>
    <revision>1.10.3</revision>
    <branch>1.10</branch>
    <created>2017-01-30</created>