Release 1.10.41.10.4

8 files changed, 148 insertions, 35 deletions

diff --git a/ChangeLog b/ChangeLog
index fa87d52e6..ac8049f7d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,9 +1,99 @@
+=== release 1.10.4 ===
+
+2017-02-23  Sebastian Dröge <slomo@coaxion.net>
+
+	* configure.ac:
+	  releasing 1.10.4
+
+2017-02-21 20:23:51 +0000  Tim-Philipp Müller <tim@centricular.com>
+
+	* libs/gst/base/gstbytereader.c:
+	* tests/check/libs/bytereader.c:
+	  bytereader: fix peek value when scanning for 00 00 01 with non-0 offset
+	  We would add the offset a second time in _scan_for_start_code()
+	  when we found a result, but it's already been added to the data
+	  pointer at the beginning of _masked_scan_uint32_peek(), so the
+	  peeked value would be wrong if the initial offset was >0, and
+	  we would potentially read memory out-of-bounds.
+	  Add unit test for all of this.
+	  https://bugzilla.gnome.org/show_bug.cgi?id=778365
+
+2017-02-20 12:16:32 +0100  Wim Taymans <wtaymans@redhat.com>
+
+	* gst/gstinfo.h:
+	  info: put () around macro arguments
+	  Put braces around macro arguments or else we might run into problems
+	  with operater precedence.
+
+2017-02-20 10:49:46 +0100  Wim Taymans <wtaymans@redhat.com>
+
+	* gst/gstdeviceproviderfactory.c:
+	  deviceproviderfactory: fix empty class check
+
+2017-01-31 21:19:18 +0200  Sebastian Dröge <sebastian@centricular.com>
+
+	* gst/parse/grammar.y:
+	  parse: Don't translate the "bin" element name
+	  Otherwise we won't be able to create bins, there is no element called
+	  "Behälter" if you're using a German locale.
+	  https://bugzilla.gnome.org/show_bug.cgi?id=777998
+
 === release 1.10.3 ===
 
-2017-01-30  Sebastian Dröge <slomo@coaxion.net>
+2017-01-30 16:26:20 +0200  Sebastian Dröge <sebastian@centricular.com>
 
+	* ChangeLog:
+	* NEWS:
+	* RELEASE:
 	* configure.ac:
-	  releasing 1.10.3
+	* docs/plugins/inspect/plugin-coreelements.xml:
+	* gstreamer.doap:
+	* win32/common/config.h:
+	* win32/common/gstversion.h:
+	  Release 1.10.3
+
+2017-01-30 15:22:00 +0200  Sebastian Dröge <sebastian@centricular.com>
+
+	* po/af.po:
+	* po/az.po:
+	* po/be.po:
+	* po/bg.po:
+	* po/ca.po:
+	* po/cs.po:
+	* po/da.po:
+	* po/de.po:
+	* po/el.po:
+	* po/en_GB.po:
+	* po/eo.po:
+	* po/es.po:
+	* po/eu.po:
+	* po/fi.po:
+	* po/fr.po:
+	* po/gl.po:
+	* po/hr.po:
+	* po/hu.po:
+	* po/id.po:
+	* po/it.po:
+	* po/ja.po:
+	* po/lt.po:
+	* po/nb.po:
+	* po/nl.po:
+	* po/pl.po:
+	* po/pt_BR.po:
+	* po/ro.po:
+	* po/ru.po:
+	* po/rw.po:
+	* po/sk.po:
+	* po/sl.po:
+	* po/sq.po:
+	* po/sr.po:
+	* po/sv.po:
+	* po/tr.po:
+	* po/uk.po:
+	* po/vi.po:
+	* po/zh_CN.po:
+	* po/zh_TW.po:
+	  Update .po files
 
 2017-01-15 11:52:44 +0000  Tim-Philipp Müller <tim@centricular.com>
 
diff --git a/NEWS b/NEWS
index c8f4d44a8..a20442471 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 570b671b6..b2016a1de 100644
--- a/RELEASE
+++ b/RELEASE
@@ -1,7 +1,7 @@
 
-Release notes for GStreamer 1.10.3
+Release notes for GStreamer 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!
 
 
@@ -35,15 +35,8 @@ contains a set of codecs plugins based on libav (formerly gst-ffmpeg)
 
 Bugs fixed in this release
      
-      * 776125 : fix an use after free in gst_base_sink_send_event()
-      * 775538 : Property " name " is not set for the net client clock
-      * 775661 : gstconfig: Compile failure for xtensa and microblaze architectures (unaligned access support)
-      * 775714 : bash autocomplete uses ges-launch for parameter autocompletion
-      * 775728 : gstconfig: Compile failure for arc and nios2 architectures (unaligned access support)
-      * 775921 : multiqueue: Fix overflow on get_buffering_level()
-      * 776039 : queue: deadlock between sink query and state change
-      * 776401 : gst-launch should set GST_GL_XINITHREADS so that XinitThread() is called appropriately
-      * 777263 : datetime: out of bounds read in gst_date_time_new_from_iso8601_string()
+      * 777998 : Bins can not be parsed when system language is German
+      * 778365 : bytereader: offset accounted twice in _masked_scan_uint32_peek for H264 special case
 
 ==== Download ====
 
@@ -80,15 +73,7 @@ subscribe to the gstreamer-devel list.
         
 Contributors to this release
     
-      * Edward Hervey
-      * Fabrice Bellet
-      * Jan Schmidt
-      * Marcin Kolny
-      * Nicolas Dechesne
-      * Peter Seiderer
-      * Ricardo Ribalda Delgado
       * Sebastian Dröge
-      * Seungha Yang
-      * Stefan Sauer
       * Tim-Philipp Müller
+      * Wim Taymans
  
\ No newline at end of file
diff --git a/configure.ac b/configure.ac
index 5081a75cf..314245790 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ dnl initialize autoconf
 dnl when going to/from release please set the nano (fourth number) right !
 dnl releases only do Wall, git and prerelease does Werror too
 dnl
-AC_INIT([GStreamer],[1.10.3],[http://bugzilla.gnome.org/enter_bug.cgi?product=GStreamer],[gstreamer])
+AC_INIT([GStreamer],[1.10.4],[http://bugzilla.gnome.org/enter_bug.cgi?product=GStreamer],[gstreamer])
 AG_GST_INIT
 
 dnl initialize automake (we require GNU make)
@@ -62,7 +62,7 @@ dnl      1.2.5 => 205
 dnl      1.10.9 (who knows) => 1009
 dnl
 dnl sets GST_LT_LDFLAGS
-AS_LIBTOOL(GST, 1003, 0, 1003)
+AS_LIBTOOL(GST, 1004, 0, 1004)
 
 dnl *** autotools stuff ****
 
diff --git a/docs/plugins/inspect/plugin-coreelements.xml b/docs/plugins/inspect/plugin-coreelements.xml
index 040a341de..7b3935faa 100644
--- a/docs/plugins/inspect/plugin-coreelements.xml
+++ b/docs/plugins/inspect/plugin-coreelements.xml
@@ -3,7 +3,7 @@
   <description>GStreamer core elements</description>
   <filename>../../plugins/elements/.libs/libgstcoreelements.so</filename>
   <basename>libgstcoreelements.so</basename>
-  <version>1.10.3</version>
+  <version>1.10.4</version>
   <license>LGPL</license>
   <source>gstreamer</source>
   <package>GStreamer source release</package>
diff --git a/gstreamer.doap b/gstreamer.doap
index 54123a4e2..cdeff95ac 100644
--- a/gstreamer.doap
+++ b/gstreamer.doap
@@ -40,6 +40,16 @@ hierarchy, and a set of media-agnostic core elements.
 
  <release>
   <Version>
+   <revision>1.10.4</revision>
+   <branch>1.10</branch>
+   <name></name>
+   <created>2017-02-23</created>
+   <file-release rdf:resource="http://gstreamer.freedesktop.org/src/gstreamer/gstreamer-1.10.4.tar.xz" />
+  </Version>
+ </release>
+
+ <release>
+  <Version>
    <revision>1.10.3</revision>
    <branch>1.10</branch>
    <name></name>
diff --git a/win32/common/config.h b/win32/common/config.h
index 830034a01..5e2f48a7f 100644
--- a/win32/common/config.h
+++ b/win32/common/config.h
@@ -68,7 +68,7 @@
 #define GST_PACKAGE_ORIGIN "Unknown package origin"
 
 /* GStreamer package release date/time for plugins as YYYY-MM-DD */
-#define GST_PACKAGE_RELEASE_DATETIME "2017-01-30"
+#define GST_PACKAGE_RELEASE_DATETIME "2017-02-23"
 
 /* Define if static plugins should be built */
 #undef GST_PLUGIN_BUILD_STATIC
@@ -468,7 +468,7 @@
 #define PACKAGE_NAME "GStreamer"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "GStreamer 1.10.3"
+#define PACKAGE_STRING "GStreamer 1.10.4"
 
 /* Define to the one symbol short name of this package. */
 #define PACKAGE_TARNAME "gstreamer"
@@ -477,7 +477,7 @@
 #undef PACKAGE_URL
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "1.10.3"
+#define PACKAGE_VERSION "1.10.4"
 
 /* directory where plugins are located */
 #ifdef _DEBUG
@@ -521,7 +521,7 @@
 #undef USE_POISONING
 
 /* Version number of package */
-#define VERSION "1.10.3"
+#define VERSION "1.10.4"
 
 /* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
    significant byte first (like Motorola and SPARC, unlike Intel). */
diff --git a/win32/common/gstversion.h b/win32/common/gstversion.h
index ea4503f67..dcc1d2216 100644
--- a/win32/common/gstversion.h
+++ b/win32/common/gstversion.h
@@ -60,7 +60,7 @@ G_BEGIN_DECLS
  *
  * The micro version of GStreamer at compile time:
  */
-#define GST_VERSION_MICRO (3)
+#define GST_VERSION_MICRO (4)
 /**
  * GST_VERSION_NANO:
  *