Release 1.12.21.12.2

8 files changed, 73 insertions, 30 deletions

diff --git a/ChangeLog b/ChangeLog
index f01002b..adf0b3e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,9 +1,29 @@
+=== release 1.12.2 ===
+
+2017-07-14  Sebastian Dröge <slomo@coaxion.net>
+
+	* configure.ac:
+	  releasing 1.12.2
+
+2017-07-10 10:33:03 +0300  Sebastian Dröge <sebastian@centricular.com>
+
+	* ext/libav/gstavmux.c:
+	  avmux: Blacklist scc muxer
+	  We have no codec mappings for it and it's a subtitle/closed caption
+	  "muxer" anyway.
+
 === release 1.12.1 ===
 
-2017-06-20  Sebastian Dröge <slomo@coaxion.net>
+2017-06-20 12:07:33 +0300  Sebastian Dröge <sebastian@centricular.com>
 
+	* ChangeLog:
+	* NEWS:
+	* RELEASE:
 	* configure.ac:
-	  releasing 1.12.1
+	* docs/plugins/inspect/plugin-libav.xml:
+	* gst-libav.doap:
+	* meson.build:
+	  Release 1.12.1
 
 2017-06-20 10:50:24 +0300  Sebastian Dröge <sebastian@centricular.com>
 
diff --git a/NEWS b/NEWS
index ef19bac..ca3bb54 100644
--- a/NEWS
+++ b/NEWS
@@ -1,8 +1,8 @@
 # GStreamer 1.12 Release Notes
 
 GStreamer 1.12.0 was originally released on 4th May 2017.
-The latest bug-fix release in the 1.12 series is [1.12.1](#1.12.1) and was
-released on 20 June 2017.
+The latest bug-fix release in the 1.12 series is [1.12.2](#1.12.2) and was
+released on 14 July 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.12/][latest] for the latest
 version of this document.
 
-*Last updated: Tuesday 20 June 2017, 07:30 UTC [(log)][gitlog]*
+*Last updated: Friday 14 July 2017, 10:00 UTC [(log)][gitlog]*
 
 [latest]: https://gstreamer.freedesktop.org/releases/1.12/
 [gitlog]: https://cgit.freedesktop.org/gstreamer/www/log/src/htdocs/releases/1.12/release-notes-1.12.md
@@ -723,7 +723,7 @@ is a stable branch.
 
 ### 1.12.1
 
-The first 1.10 bug-fix release (1.12.1) was released on 20 June 2017.
+The first 1.12 bug-fix release (1.12.1) was released on 20 June 2017.
 This release only contains bugfixes and it should be safe to update from 1.12.x.
 
 #### Major bugfixes in 1.12.1
@@ -751,6 +751,34 @@ GIT logs or ChangeLogs of the particular modules.
 
 [buglist-1.12.1]: https://bugzilla.gnome.org/buglist.cgi?bug_status=RESOLVED&bug_status=VERIFIED&classification=Platform&limit=0&list_id=225693&order=bug_id&product=GStreamer&query_format=advanced&resolution=FIXED&target_milestone=1.12.1
 
+<a name="1.12.2"></a>
+
+### 1.12.2
+
+The second 1.12 bug-fix release (1.12.2) was released on 14 July 2017.
+This release only contains bugfixes and it should be safe to update from 1.12.x.
+
+#### Major bugfixes in 1.12.2
+
+ - Various fixes for crashes, assertions, deadlocks and memory leaks
+ - Regression fix for playback of live HLS streams
+ - Regression fix for crash when playing back a tunneled RTSP stream
+ - Regression fix for playback of RLE animations in MOV containers
+ - Regression fix for RTP GSM payloading producing corrupted output
+ - Major bugfixes to the MXF demuxer, mostly related to seeking and
+   fixes to the frame reordering handling in the MXF muxer and demuxer
+ - Fix for playback of mono streams on MacOS
+ - More fixes for index handling of ASF containers
+ - Various fixes to adaptivedemux, DASH and HLS demuxers
+ - Fix deadlock in gstreamer-editing-services during class initialization
+ - ... and many, many more!
+
+For a full list of bugfixes see [Bugzilla][buglist-1.12.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.12.2]: https://bugzilla.gnome.org/buglist.cgi?bug_status=RESOLVED&bug_status=VERIFIED&classification=Platform&limit=0&list_id=225693&order=bug_id&product=GStreamer&query_format=advanced&resolution=FIXED&target_milestone=1.12.2
+
 ## Known Issues
 
 - The `webrtcdsp` element is currently not shipped as part of the Windows
@@ -774,7 +802,8 @@ in October.
 
 - - -
 
-*These release notes have been prepared by Sebastian Dröge, Tim-Philipp Müller
-and Víctor Manuel Jáquez Leal.*
+*These release notes have been prepared by Olivier Crête, Sebastian Dröge,
+Nicolas Dufresne, Víctor Manuel Jáquez Leal, Tim-Philipp Müller, Philippe
+Normand and Thibault Saunier.*
 
 *License: [CC BY-SA 4.0](http://creativecommons.org/licenses/by-sa/4.0/)*
diff --git a/RELEASE b/RELEASE
index 323de8a..604abec 100644
--- a/RELEASE
+++ b/RELEASE
@@ -1,7 +1,7 @@
 
-Release notes for GStreamer libav Plugins 1.12.1
+Release notes for GStreamer libav Plugins 1.12.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.12 release series of your favourite cross-platform multimedia framework!
 
 
@@ -35,11 +35,6 @@ contains a set of less supported plugins that haven't passed the
 
   
 
-Bugs fixed in this release
-     
-      * 694416 : Passing of $AS, etc to libav configure breaks on some platforms
-      * 782700 : mpg file fails to play if system ffmpeg is compiled with nvcuid support.
-
 ==== Download ====
 
 You can find source releases of gst-libav in the download
@@ -75,6 +70,5 @@ subscribe to the gstreamer-devel list.
         
 Contributors to this release
     
-      * Jan Schmidt
       * Sebastian Dröge
  
\ No newline at end of file
diff --git a/configure.ac b/configure.ac
index 89d608e..94e028b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,7 @@ AC_PREREQ(2.69)
 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 libav, 1.12.1,
+AC_INIT(GStreamer libav, 1.12.2,
     http://bugzilla.gnome.org/enter_bug.cgi?product=GStreamer,
     gst-libav)
 
@@ -42,7 +42,7 @@ AC_SUBST(GST_API_VERSION)
 dnl *** Check for external $AS vs detected by AS_LIBTOOL
 user_AS="$AS"
 AG_GST_LIBTOOL_PREPARE
-AS_LIBTOOL(GST, 1201, 0, 1201)
+AS_LIBTOOL(GST, 1202, 0, 1202)
 
 dnl *** required versions of GStreamer stuff ***
 GST_REQ=1.12.0
diff --git a/docs/plugins/gst-libav-plugins.hierarchy b/docs/plugins/gst-libav-plugins.hierarchy
index e1a02d8..f79b58d 100644
--- a/docs/plugins/gst-libav-plugins.hierarchy
+++ b/docs/plugins/gst-libav-plugins.hierarchy
@@ -536,7 +536,6 @@ GObject
         avmux_psp
         avmux_rm
         avmux_rso
-        avmux_scc
         avmux_singlejpeg
         avmux_smjpeg
         avmux_smoothstreaming
diff --git a/docs/plugins/inspect/plugin-libav.xml b/docs/plugins/inspect/plugin-libav.xml
index b4b9c9a..23dae8c 100644
--- a/docs/plugins/inspect/plugin-libav.xml
+++ b/docs/plugins/inspect/plugin-libav.xml
@@ -3,7 +3,7 @@
   <description>All libav codecs and formats (local snapshot)</description>
   <filename>../../ext/libav/.libs/libgstlibav.so</filename>
   <basename>libgstlibav.so</basename>
-  <version>1.12.1</version>
+  <version>1.12.2</version>
   <license>LGPL</license>
   <source>gst-libav</source>
   <package>libav</package>
@@ -11308,15 +11308,6 @@
       </pads>
     </element>
     <element>
-      <name>avmux_scc</name>
-      <longname>libav Scenarist Closed Captions muxer</longname>
-      <class>Codec/Muxer</class>
-      <description>libav Scenarist Closed Captions muxer</description>
-      <author>Wim Taymans &lt;wim.taymans@chello.be&gt;, Ronald Bultje &lt;rbultje@ronald.bitfreak.net&gt;</author>
-      <pads>
-      </pads>
-    </element>
-    <element>
       <name>avmux_singlejpeg</name>
       <longname>libav JPEG single image muxer</longname>
       <class>Codec/Muxer</class>
diff --git a/gst-libav.doap b/gst-libav.doap
index c185067..93b6d11 100644
--- a/gst-libav.doap
+++ b/gst-libav.doap
@@ -34,6 +34,16 @@ colorspace conversion elements.
 
  <release>
   <Version>
+   <revision>1.12.2</revision>
+   <branch>1.12</branch>
+   <name></name>
+   <created>2017-07-14</created>
+   <file-release rdf:resource="http://gstreamer.freedesktop.org/src/gst-libav/gst-libav-1.12.2.tar.xz" />
+  </Version>
+ </release>
+
+ <release>
+  <Version>
    <revision>1.12.1</revision>
    <branch>1.12</branch>
    <name></name>
diff --git a/meson.build b/meson.build
index 5cac659..120153a 100644
--- a/meson.build
+++ b/meson.build
@@ -1,5 +1,5 @@
 project('gst-libav', 'c', 'cpp',
-  version : '1.12.1',
+  version : '1.12.2',
   meson_version : '>= 0.36.0',
   default_options : [ 'warning_level=1',
                       'buildtype=debugoptimized' ])