Release 1.10.21.10.2

5 files changed, 69 insertions, 15 deletions

diff --git a/ChangeLog b/ChangeLog
index 8bf7e693..57508347 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,9 +1,31 @@
+=== release 1.10.2 ===
+
+2016-11-29  Sebastian Dröge <slomo@coaxion.net>
+
+	* configure.ac:
+	  releasing 1.10.2
+
+2016-11-20 15:34:46 +0100  Philippe Renon <philippe_renon@yahoo.fr>
+
+	* ges/ges-uri-asset.c:
+	  ges-uri-asset: fix compile error 'timeout' may be used uninitialized
+	  https://bugzilla.gnome.org/show_bug.cgi?id=774751
+
+2016-11-20 14:55:34 +0000  Tim-Philipp Müller <tim@centricular.com>
+
+	* meson.build:
+	  meson: update version
+
 === release 1.10.1 ===
 
-2016-11-17  Sebastian Dröge <slomo@coaxion.net>
+2016-11-17 15:58:20 +0200  Sebastian Dröge <sebastian@centricular.com>
 
+	* ChangeLog:
+	* NEWS:
+	* RELEASE:
 	* configure.ac:
-	  releasing 1.10.1
+	* gst-editing-services.doap:
+	  Release 1.10.1
 
 2016-01-12 14:51:55 +0000  Mathieu Duponchelle <mathieu.duponchelle@opencreed.com>
 
diff --git a/NEWS b/NEWS
index 23b5ab71..815dee3b 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.1](#1.10.1) and was
-released on 17 November 2016.
+The latest bug-fix release in the 1.10 series is [1.10.2](#1.10.2) and was
+released on 29 November 2016.
 
 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: Tuesday 17 Nov 2016, 15:00 UTC [(log)][gitlog]*
+*Last updated: Tuesday 29 Nov 2016, 12:30 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
@@ -1084,7 +1084,7 @@ This release only contains bugfixes and it should be safe to update from 1.10.x.
 
 #### Major bugfixes in 1.10.1
 
- - Security-relevant bugfix in the vmnc decoder (no CVE)
+ - Security-relevant bugfix in the vmnc decoder (CVE-2016-9445, CVE-2016-9446)
  - Various bugfixes to playbin3/decodebin3
  - Fix error at the end of playing any WAV file
  - Fix usability of androidmedia plugin if the camera or sensor API is not
@@ -1099,6 +1099,31 @@ GIT logs or ChangeLogs of the particular modules.
 
 [buglist-1.10.1]: https://bugzilla.gnome.org/buglist.cgi?bug_status=RESOLVED&bug_status=VERIFIED&classification=Platform&limit=0&list_id=168172&order=bug_id&product=GStreamer&query_format=advanced&resolution=FIXED&target_milestone=1.10.1
 
+<a name="1.10.2"></a>
+
+### 1.10.2
+
+The first 1.10 bug-fix release (1.10.2) was released on 29 November 2016.
+This release only contains bugfixes and it should be safe to update from 1.10.x.
+
+#### Major bugfixes in 1.10.2
+
+ - Security-relevant bugfix in the FLI/FLX/FLC decoder (CVE-2016-9634,
+   CVE-2016-9635, CVE-2016-9636)
+ - Various fixes for crashes, assertions and other failures on fuzzed input
+   files (among others, thanks to Hanno Böck for testing and reporting)
+ - SAVP/SAVPF profile in gst-rtsp-server works for live streams again, and the
+   correct MIKEY policy message is generated
+ - Further OpenGL related bugfixes
+ - gst-libav was updated to ffmpeg 3.2.1
+ - ... and many, many more!
+
+For a full list of bugfixes see [Bugzilla][buglist-1.10.2]. 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.2]: https://bugzilla.gnome.org/buglist.cgi?bug_status=RESOLVED&bug_status=VERIFIED&classification=Platform&limit=0&list_id=168172&order=bug_id&product=GStreamer&query_format=advanced&resolution=FIXED&target_milestone=1.10.2
+
 ## Known Issues
 
 - iOS builds with iOS 6 SDK and old C++ STL. You need to select iOS 6 instead
diff --git a/RELEASE b/RELEASE
index af6433e2..c2d3e7fd 100644
--- a/RELEASE
+++ b/RELEASE
@@ -1,11 +1,11 @@
 
-Release notes for GStreamer Editing Services 1.10.1
+Release notes for GStreamer Editing Services 1.10.2
 
-The GStreamer team is proud to announce the first bugfix release in the stable
+The GStreamer team is proud to announce the second bugfix release in the stable
 1.10 release series of your favourite cross-platform multimedia framework!
 
 
-This release only contains bugfixes and it is safe to update from 1.10.0. For a
+This release only contains bugfixes and it is safe to update from 1.10.x. For a
 full list of bugfixes see Bugzilla.
 
 
@@ -15,7 +15,7 @@ See /releases/1.10/ for the full release notes.
 
 Bugs fixed in this release
      
-      * 774149 : nlecomposition: De-duplicate seek events based on their sequence number
+      * 774751 : ges-uri-asset: fix compile error 'timeout' may be used uninitialized
 
 ==== Download ====
 
@@ -52,8 +52,6 @@ subscribe to the gstreamer-devel list.
         
 Contributors to this release
     
-      * Mathieu Duponchelle
-      * Sebastian Dröge
-      * Thibault Saunier
+      * Philippe Renon
       * Tim-Philipp Müller
  
\ No newline at end of file
diff --git a/configure.ac b/configure.ac
index c50b971b..b25d8229 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.1,
+AC_INIT(GStreamer Editing Services, 1.10.2,
     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, 1001, 0, 1001)
+AS_LIBTOOL(GST, 1002, 0, 1002)
 
 dnl *** required versions of GStreamer stuff ***
 GST_REQ=1.10.0
diff --git a/gst-editing-services.doap b/gst-editing-services.doap
index 08f89d52..53d1408f 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.2</revision>
+   <branch>1.10</branch>
+   <created>2016-11-29</created>
+   <file-release rdf:resource="http://gstreamer.freedesktop.org/src/gst-editing-services/gst-editing-services-1.10.2.tar.xz" />
+  </Version>
+ </release>
+
+ <release>
+  <Version>
    <revision>1.10.1</revision>
    <branch>1.10</branch>
    <created>2016-11-17</created>