Release 1.18.51.18.5

5 files changed, 646 insertions, 10 deletions

diff --git a/ChangeLog b/ChangeLog
index cdf38df04..78ababc0b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,326 @@
+=== release 1.18.5 ===
+
+2021-09-08 20:02:20 +0100  Tim-Philipp Müller <tim@centricular.com>
+
+	* ChangeLog:
+	* NEWS:
+	* RELEASE:
+	* gst-plugins-base.doap:
+	* meson.build:
+	  Release 1.18.5
+
+2021-03-15 19:05:44 +0530  Nirbheek Chauhan <nirbheek@centricular.com>
+
+	* gst-libs/gst/rtsp/gstrtspconnection.c:
+	  rtspconnection: Consistently translate GIOError to GstRTSPResult
+	  The users of this API need to be able to differentiate between EINTR
+	  and ERROR. For example, in rtspsrc, gst_rtsp_conninfo_connect()
+	  behaves differently when gst_rtsp_connection_connect_with_response_usec()
+	  returns an ERROR or EINTR. The former is an element error while the
+	  latter is simple a GST_ERROR since it was a user cancellation of the
+	  connection attempt.
+	  Due to this, rtspsrc was incorrectly emitting element errors while
+	  going to NULL, which would or would not reach the application in
+	  a racy manner.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-base/-/merge_requests/1271>
+
+2021-06-11 09:27:46 -0600  Scott Moreau <oreaus@gmail.com>
+
+	* gst-libs/gst/gl/wayland/gstglwindow_wayland_egl.c:
+	  gl/wayland: Use consistent wl_display when creating work queue for proxy wrapper
+	  Without this, glimagesink since wayland 727c7903 fails with
+	  gst-launch-1.0: ../src/wayland-client.c:2181: wl_proxy_set_queue:
+	  Assertion 'proxy->display == queue->display' failed.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-base/-/merge_requests/1247>
+
+2021-07-09 09:49:15 +0300  Sebastian Dröge <sebastian@centricular.com>
+
+	* gst-libs/gst/audio/gstaudioaggregator.c:
+	* tests/check/elements/audiomixer.c:
+	  audioaggregator: Resync on the next buffer when dropping a buffer on discont resyncing
+	  If a buffer is dropped during resyncing on a discont because either its
+	  end offset is already before the current output offset of the
+	  aggregator or because it fully overlaps with the part of the current
+	  output buffer that was already filled, then don't just assume that the
+	  next buffer is going to start at exactly the expected offset. It might
+	  still require some more dropping of samples.
+	  This caused the input to be mixed with an offset to its actual position
+	  in the output stream, causing additional latency and wrong
+	  synchronization between the different input streams.
+	  Instead consider each buffer after a discont as a discont until the
+	  aggregator actually resynced and starts mixing samples from the input
+	  again.
+	  Also update the start output offset of a new input buffer if samples
+	  have to be dropped at the beginning. Otherwise it might be mixed too
+	  early into the output and overwrite part of the output buffer that
+	  already took samples from this input into account.
+	  Fixes https://gitlab.freedesktop.org/gstreamer/gst-plugins-base/-/issues/912
+	  which is a regression introduced by https://gitlab.freedesktop.org/gstreamer/gst-plugins-base/-/merge_requests/1180/
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-base/-/merge_requests/1228>
+
+2021-05-06 19:01:41 +0200  Jan Alexander Steffens (heftig) <jan.steffens@ltnglobal.com>
+
+	* gst-libs/gst/video/video-converter.c:
+	  video-converter: Set up gamma tables only once
+	  When the video converter is using multiple threads, the gamma tables
+	  were created multiple times, leaking the tables set up for the previous
+	  thread.
+	  Only calculate the tables once.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-base/-/merge_requests/1217>
+
+2021-05-06 18:22:45 +0200  Jan Alexander Steffens (heftig) <jan.steffens@ltnglobal.com>
+
+	* gst-libs/gst/audio/audio-converter.c:
+	  audio-converter: Free config when gst_audio_converter_new fails
+	  The config got leaked when parameter validation fails.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-base/-/merge_requests/1217>
+
+2021-06-25 23:42:34 +1000  Jan Schmidt <jan@centricular.com>
+
+	* gst-libs/gst/video/video-converter.c:
+	  video-converter: Set up matrix tables only once.
+	  When configuring a multi-thread converter, only allocate the
+	  shared colour conversion matrices once for the first thread,
+	  to avoid allocating multiple times and leaking memory.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-base/-/merge_requests/1220>
+
+2021-04-23 18:03:20 +0200  Per Förlin <perfn@axis.com>
+
+	* gst-libs/gst/rtsp/gstrtspconnection.c:
+	  gstrtspconnection: Add IPv6 support for tunneled mode
+	  An IPv6 address must be specified within [] brackets.
+	  Add brackets for IPv6 address used for tunneled mode,
+	  for non-tunneled this is already supported.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-base/-/merge_requests/1214>
+
+2021-06-21 14:06:14 +0000  Sergei Kovalev <sergei@pexip.com>
+
+	* gst-libs/gst/audio/gstaudiobasesink.c:
+	  audiobasesink: Fix of double lock release
+	  Add missing "return;" which prevents double lock release.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-base/-/merge_requests/1210>
+
+2021-05-31 09:14:53 +0200  Daniel Knobe <daniel-knobe@web.de>
+
+	* gst/rawparse/gstrawbaseparse.c:
+	  rawbaseparse: check destination format correctly
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-base/-/merge_requests/1186>
+
+2021-05-26 22:50:22 -0400  Olivier Crête <olivier.crete@collabora.com>
+
+	* tests/check/elements/audiomixer.c:
+	  audiomixer: Add test for discont going backwards
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-base/-/merge_requests/1185>
+
+2021-05-27 16:05:04 -0400  Olivier Crête <olivier.crete@collabora.com>
+
+	* gst-libs/gst/audio/gstaudioaggregator.c:
+	  audioaggregator: Don't overwrite already written samples
+	  On re-sync, don't forget what has already been written. Instead, just
+	  drop any samples that overlap with parts that were already filled.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-base/-/merge_requests/1185>
+
+2021-05-27 16:20:09 +0900  Seungha Yang <seungha@centricular.com>
+
+	* gst-libs/gst/audio/gstaudiobasesrc.c:
+	  audiobasesrc: Fix divide by zero assertion
+	  GstAudioRingBufferSpec can be cleared from other thread, then
+	  rate value will be zero
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-base/-/merge_requests/1183>
+
+2021-05-26 23:22:45 +0200  Marijn Suijten <marijns95@gmail.com>
+
+	* gst-libs/gst/audio/audio-format.c:
+	* gst-libs/gst/video/video-format.c:
+	  audio,video-format: Make generate_raw_formats idempotent for assertions
+	  When compiling without assertions `g_assert` and its contents disappear
+	  resulting in no list being deserialized at all and the
+	  `gst_{audio,video}_formats_raw` functions to return an empty collection.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-base/-/merge_requests/1182>
+
+2021-05-20 11:58:58 -0400  Nicolas Dufresne <nicolas.dufresne@collabora.com>
+
+	* gst/compositor/blend.c:
+	  compositor: Fix NV12 blend operation
+	  The full src_height/width was being used instead of the remaining
+	  width/height for the current band. As a side effect, that value would
+	  get erroneously reset and would cause overrun.
+	  Fixes #887
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-base/-/merge_requests/1163>
+
+2021-05-02 20:45:01 +0300  Sebastian Dröge <sebastian@centricular.com>
+
+	* gst-libs/gst/app/gstappsrc.c:
+	  appsrc: Don't leak buffer list while wrongly unreffing buffer on EOS/flushing
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-base/-/merge_requests/1135>
+
+2021-05-02 20:45:36 +0300  Sebastian Dröge <sebastian@centricular.com>
+
+	* gst-libs/gst/app/meson.build:
+	  app: Add gstappsrc.h to the enum headers in meson.build
+	  It's already indirectly included but let's better be explicit here.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-base/-/merge_requests/1135>
+
+2021-04-30 20:42:55 +0530  Nirbheek Chauhan <nirbheek@centricular.com>
+
+	* gst/videotestsrc/gstvideotestsrc.c:
+	  videotestsrc: Fix a leak when computing alpha caps
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-base/-/merge_requests/1132>
+
+2021-04-26 14:25:03 -0400  Xavier Claessens <xavier.claessens@collabora.com>
+
+	* gst-libs/gst/gl/meson.build:
+	  gstgl: Fix build when Meson >= 0.58.0rc1
+	  "implicit_include_directories: false" now also means that current build
+	  directory is not added to include paths by default any more. We have to
+	  add it manually because we have some custom_target() that generate
+	  headers in current build directory.
+	  See https://github.com/mesonbuild/meson/issues/8700.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-base/-/merge_requests/1127>
+
+2021-04-21 02:05:36 +0900  Seungha Yang <seungha@centricular.com>
+
+	* gst/playback/gsturidecodebin.c:
+	  uridecodebin: Don't force floating reference for future reusable decodebin
+	  uridecodebin assumes that refcount of decodebins stored in pending_decodebins
+	  are floating but it might not be true in case that refcount of the decodebin
+	  was touched in other places. To avoid the floating refcount issue,
+	  hold strong reference.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-base/-/merge_requests/1119>
+
+2021-04-21 02:02:48 +0900  Seungha Yang <seungha@centricular.com>
+
+	* gst/playback/gsturidecodebin.c:
+	  uridecodebin: Use gst_object_ref instead of g_object_ref
+	  It's more debugging friendly (tracer for example)
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-base/-/merge_requests/1119>
+
+2021-04-12 14:02:46 +0200  Mathieu Duponchelle <mathieu@centricular.com>
+
+	* gst/playback/gstplaybin2.c:
+	* gst/playback/gstplaybin3.c:
+	  playbin{2,3}: fix base_time selection when flush seeking live
+	  This is a direct translation of
+	  <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/429>,
+	  as playbin{2,3} insulates its sub groups state changes from the pipeline
+	  base class, it needs to track whether the subgroup is live itself,
+	  and handle RESET_TIME the same way GstPipeline does.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-base/-/merge_requests/1110>
+
+2021-04-06 13:22:15 +0200  Robin Burchell <robin.burchell@crimson.no>
+
+	* gst/gio/gstgiobasesink.c:
+	  gstgiobasesink: Handle incomplete writes in gst_gio_base_sink_render()
+	  As the comment asked, yes, incomplete writes can happen.
+	  I have encountered this with an sshfs mount, for example.
+	  It seems like g_output_stream_write_all() is designed to handle this case,
+	  by not returning until the requested buffer has been completely written,
+	  or an error occurs, which seems to match up with the desired behaviour.
+	  Fixes https://gitlab.freedesktop.org/gstreamer/gst-plugins-base/-/issues/885
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-base/-/merge_requests/1108>
+
+2021-04-05 00:34:21 +0900  Seungha Yang <seungha@centricular.com>
+
+	* ext/pango/gstclockoverlay.c:
+	* ext/pango/gstclockoverlay.h:
+	  clockoverlay: Fix broken string formatting by strftime() on Windows
+	  Like other foobarA variant APIs on Windows, formatted string
+	  by strftime() is ANSI string, not unicode encoded one.
+	  It would be problematic for non-english locale systems.
+	  We should use unicode version API (wcsftime in this case)
+	  whenever it's possible on Windows.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-base/-/merge_requests/1107>
+
+2021-03-18 19:18:36 +1100  Matthew Waters <matthew@centricular.com>
+
+	* ext/gl/gstgleffects.c:
+	* ext/gl/gstglimagesink.h:
+	* ext/opus/gstopusenc.c:
+	* gst-libs/gst/audio/gstaudiodecoder.c:
+	* gst-libs/gst/audio/gstaudiometa.c:
+	* gst-libs/gst/audio/streamvolume.c:
+	* gst-libs/gst/gl/cocoa/gstglcaopengllayer.m:
+	* gst-libs/gst/gl/egl/gstgldisplay_egl.c:
+	* gst-libs/gst/gl/egl/gstglmemoryegl.c:
+	* gst-libs/gst/gl/gbm/gstgldisplay_gbm.c:
+	* gst-libs/gst/gl/gl_mkenum.py:
+	* gst-libs/gst/gl/gstglbasememory.c:
+	* gst-libs/gst/gl/gstglbuffer.c:
+	* gst-libs/gst/gl/gstglcontext.c:
+	* gst-libs/gst/gl/gstgldebug.c:
+	* gst-libs/gst/gl/gstgldisplay.c:
+	* gst-libs/gst/gl/gstglfeature.c:
+	* gst-libs/gst/gl/gstglmemory.c:
+	* gst-libs/gst/gl/gstglmemorypbo.c:
+	* gst-libs/gst/gl/gstglquery.c:
+	* gst-libs/gst/gl/gstglrenderbuffer.c:
+	* gst-libs/gst/gl/gstglsl.c:
+	* gst-libs/gst/gl/gstglsyncmeta.c:
+	* gst-libs/gst/gl/gstglutils.c:
+	* gst-libs/gst/gl/gstglwindow.c:
+	* gst-libs/gst/gl/wayland/wayland_event_source.c:
+	* gst-libs/gst/pbutils/encoding-profile.c:
+	* gst-libs/gst/pbutils/gstaudiovisualizer.c:
+	* gst-libs/gst/rtp/gstrtpmeta.c:
+	* gst-libs/gst/rtsp/gstrtspextension.c:
+	* gst-libs/gst/tag/gsttagmux.c:
+	* gst-libs/gst/tag/xmpwriter.c:
+	* gst-libs/gst/video/gstvideoaffinetransformationmeta.c:
+	* gst-libs/gst/video/gstvideoaggregator.c:
+	* gst-libs/gst/video/gstvideodecoder.c:
+	* gst-libs/gst/video/gstvideoencoder.c:
+	* gst-libs/gst/video/gstvideometa.c:
+	* gst-libs/gst/video/video-anc.c:
+	* gst-libs/gst/video/video-multiview.c:
+	* gst-libs/gst/video/video-overlay-composition.c:
+	* gst/adder/gstadder.h:
+	* gst/encoding/gstencodebin.c:
+	* gst/playback/gstplay-enum.c:
+	* gst/videorate/gstvideorate.h:
+	* gst/videoscale/gstvideoscale.c:
+	  gst: don't use volatile to mean atomic
+	  volatile is not sufficient to provide atomic guarantees and real atomics
+	  should be used instead.  GCC 11 has started warning about using volatile
+	  with atomic operations.
+	  https://gitlab.gnome.org/GNOME/glib/-/merge_requests/1719
+	  Discovered in https://gitlab.freedesktop.org/gstreamer/gst-plugins-good/-/issues/868
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-base/-/merge_requests/1106>
+
+2021-04-04 21:18:59 +0700  Binh Truong <crziter@gmail.com>
+
+	* gst-libs/gst/gl/gl_mkenum.py:
+	  Fix build issue on MinGW64
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-base/-/merge_requests/1098>
+
+2020-12-11 10:15:32 +0100  Edward Hervey <edward@centricular.com>
+
+	* gst/playback/gstparsebin.c:
+	  parsebin: Put stream flags in GstStream
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-base/-/merge_requests/1086>
+
+2021-03-22 13:59:39 +1100  Matthew Waters <matthew@centricular.com>
+
+	* gst-libs/gst/gl/wayland/gstglwindow_wayland_egl.c:
+	  gl/wayland: provide a dummy global_remove function
+	  Even if we don't care about any global objects being removed, wayland
+	  will still error if globals are removed without a corresponding listener
+	  set up for them.  e.g. wl_output hotplugging
+	  Discovered by: Matthias Clasen
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-base/-/merge_requests/1085>
+
+2021-03-21 16:46:54 +1100  Jan Schmidt <jan@centricular.com>
+
+	* gst/gio/gstgiosrc.c:
+	  gstgiosrc: Don't leak scheme string in gst_gio_src_query()
+	  Add a g_free() in the code path that forwards the query to the parent
+	  handler.
+	  Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-base/-/merge_requests/1084>
+
+2021-03-15 19:48:54 +0000  Tim-Philipp Müller <tim@centricular.com>
+
+	* meson.build:
+	  Back to development
+
 === release 1.18.4 ===
 
 2021-03-15 17:47:59 +0000  Tim-Philipp Müller <tim@centricular.com>
@@ -71497,7 +71820,6 @@
 	* gst-libs/gst/fft/fft.h:
 	* gst-libs/gst/fft/gstfft.h:
 	* gst-libs/gst/pbutils/Makefile.am:
-	* gst-libs/gst/pbutils/gstpbutils.h:
 	* gst-libs/gst/riff/Makefile.am:
 	* gst-libs/gst/riff/riff.h:
 	* gst-libs/gst/rtp/Makefile.am:
diff --git a/NEWS b/NEWS
index 3ada8869c..17f17457b 100644
--- a/NEWS
+++ b/NEWS
@@ -2,13 +2,13 @@ GStreamer 1.18 Release Notes
 
 GStreamer 1.18.0 was originally released on 8 September 2020.
 
-The latest bug-fix release in the 1.18 series is 1.18.4 and was released
-on 15 March 2021.
+The latest bug-fix release in the 1.18 series is 1.18.5 and was released
+on 8 September 2021.
 
 See https://gstreamer.freedesktop.org/releases/1.18/ for the latest
 version of this document.
 
-Last updated: Monday 15 March 2021, 13:00 UTC (log)
+Last updated: Wednesday 8 September 2021, 11:00 UTC (log)
 
 Introduction
 
@@ -2102,7 +2102,10 @@ Possibly Breaking Changes
 
 Known Issues
 
--   None in particular
+-   GStreamer 1.18 versions <= 1.18.4 would fail to build on Linux with
+    Meson 0.58 due to an issue with the include directories. Either
+    apply the patch or build with an older Meson version (<= 0.57) until
+    there is a GStreamer 1.18.5 release that includes the fix.
 
 Contributors
 
@@ -2879,6 +2882,307 @@ List of merge requests and issues fixed in 1.18.4
 -   List of Merge Requests applied in 1.18.4
 -   List of Issues fixed in 1.18.4
 
+1.18.5
+
+The fifth 1.18 bug-fix release (1.18.5) was released on 8 September
+2021.
+
+This release only contains bugfixes and security fixes and it should be
+safe to update from 1.18.x.
+
+Highlighted bugfixes in 1.18.5
+
+-   basesink: fix reverse frame stepping
+-   downloadbuffer/sparsefile: several fixes for win32
+-   systemclock: Update monotonic reference time when re-scheduling,
+    fixes high CPU usage with gnome-music when pausing playback
+-   audioaggregator: fix glitches when resyncing on discont
+-   compositor: Fix NV12 blend operation
+-   rtspconnection: Add IPv6 support for tunneled mode
+-   avidemux: fix playback of some H.264-in-AVI streams
+-   jpegdec: Fix crash when interlaced field height is not DCT block
+    size aligned
+-   qmlglsink: Keep old buffers around a bit longer if they were bound
+    by QML
+-   qml: qtitem: don’t potentially leak a large number of buffers
+-   rtpjpegpay: fix image corruption when compiled with MSVC on Windows
+-   rtspsrc: seeking improvements
+-   rtpjitterbuffer: Avoid generation of invalid timestamps
+-   rtspsrc: Fix behaviour of select-streams, new-manager,
+    request-rtcp-key and before-send signals with GLib >= 2.62
+-   multiudpsink: Fix broken SO_SNDBUF get/set on Windows
+-   openh264enc: fix broken sps/pps header generation and some minor
+    leaks
+-   mpeg2enc: fix interlace-mode detection and unbound memory usage if
+    encoder can’t keep up
+-   mfvideosrc: Fix for negative MF stride and for negotiation when
+    interlace-mode is specified
+-   tsdemux: fix seek-with-stop regression and decoding errors after
+    seeking with dvdlpcmdec
+-   rtsp-server: seek handling improvements
+-   gst-libav: fix build (and other issues) with ffmpeg 4.4
+-   cerbero: spandsp: Fix build error with Visual Studio 2019
+-   win32 packages: Fix hang in GLib when G_SLICE environment variable
+    is set
+
+gstreamer
+
+-   aggregator: Release the SRC lock while querying latency
+-   aggregator: Release pads’ peeked buffer when removing the pad or
+    finalizing it
+-   basesink: Don’t swap rstart/rstop when stepping
+-   basesrc: Print segments with GST_SEGMENT_FORMAT and not
+    GST_PTR_FORMAT
+-   childproxy: init value in gst_child_proxy_get_property() if needed
+-   clocksync: Fix providing system clock by default
+-   concat: Properly propagate seqnum of segment events
+-   concat: adjust running time offsets on downstream events
+-   concat: fix locking in SEGMENT event handler
+-   downloadbuffer/sparsefile: several fixes for win32
+-   element: NULL the lists of contexts in dispose()
+-   multiqueue: Use running time of gap events for wakeups.
+-   multiqueue: Ensure peer pad exists when iterating internal links
+-   pad: Keep IDLE probe hook alive during immediate callback
+-   pad: Ensure last flow return is set on sink pads in push mode
+-   pad: Don’t spam the debug log at INFO level when default-chaining a
+    buffer list
+-   pad: clear probes holding mutex
+-   parse-launch: Fix a critical when using the : operator.
+-   parse-launch: Don’t do delayed property setting for top-level
+    properties.
+-   plugin: load plugins with unknown license strings
+-   ptpclock: Don’t leak the GList
+-   queue2: Refuse all serialized queries when posting buffering
+    messages
+-   systemclock: Update monotonic reference time when re-scheduling
+-   High CPU usage in 1.18 (but not master) when pausing playback in
+    gnome-music
+-   Don’t use volatile to mean atomic (fixes compiler warnings with
+    gcc 11)
+
+gst-plugins-base
+
+-   appsrc: Don’t leak buffer list while wrongly unreffing buffer on
+    EOS/flushing
+-   audioaggregator: Don’t overwrite already written samples
+-   audioaggregator: Resync on the next buffer when dropping a buffer on
+    discont resyncing
+-   audiobasesink: Fix of double lock release
+-   audioaggregator: Don’t overwrite already written samples
+-   audiobasesrc: Fix divide by zero assertion
+-   clockoverlay: Fix broken string formatting by strftime() on Windows
+-   compositor: Fix NV12 blend operation
+-   giosrc: Don’t leak scheme string in gst_gio_src_query()
+-   giobasesink: Handle incomplete writes in gst_gio_base_sink_render()
+-   gl/wayland: Use consistent wl_display when creating work queue for
+    proxy wrapper
+-   gl: Fix build when Meson >= 0.58.0rc1
+-   gl/wayland: provide a dummy global_remove function
+-   playbin2: fix base_time selection when flush seeking live (such as
+    with RTSP)
+-   rtspconnection: Add IPv6 support for tunneled mode
+-   rtspconnection: Consistently translate GIOError to GstRTSPResult
+    (for rtspsrc)
+-   rawbaseparse: check destination format correctly
+-   uridecodebin: Don’t force floating reference for future reusable
+    decodebin
+-   parsebin: Put stream flags in GstStream
+-   splitmuxsink: always use factory property when set
+-   video-converter: Set up matrix tables only once.
+-   videoscale: Performance degradation from 1.16.2 -> 1.18.4
+-   videotestsrc: Fix a leak when computing alpha caps
+-   audio/video-converter: Plug some minor leaks
+-   audio,video-format: Make generate_raw_formats idempotent for
+    assertions
+-   Don’t use volatile to mean atomic (fixes compiler warnings with
+    gcc 11)
+-   Fix build issue on MinGW64
+
+gst-plugins-good
+
+-   avidemux: Also detect 0x000001 as H264 byte-stream start code in
+    codec_data
+-   deinterlace: Plug a method subobject leak
+-   deinterlace: Drop field-order field if outputting progressive
+-   jpegdec: Fix crash when interlaced field height is not DCT block
+    size aligned
+-   qmlglsink: Keep old buffers around a bit longer if they were bound
+    by QML
+-   qml: qtitem: don’t potentially leak a large number of buffers
+-   qtdemux: Force stream-start push when re-using EOS’d streams
+-   qtmux: for Apple ProRes, allow overriding pixel bit depth, e.g. when
+    exporting an opaque image, yet with alpha.
+-   qtmux: Make sure to write 64-bit STCO table when needed.
+-   rtpjpegpay: fix image corruption when compiled with MSVC on Windows
+-   rtpptdemux: Remove pads also in PAUSED->READY
+-   rtph265depay: update codec_data in caps regardless of format
+-   rtspsrc: Do not overwrite the known duration after a seek
+-   rtspsrc: De-dup seek event seqnums to avoid multiple seeks
+-   rtspsrc: Fix race saving seek event seqnum
+-   rtspsrc: Using multicast UDP has no relation to seekability, also
+    add some logging
+-   rtpjitterbuffer: Fix parsing of the mediaclk:direct= field
+-   rtpjitterbuffer: Avoid generation of invalid timestamps
+-   rtpjitterbuffer: Check srcresult before waiting on the condition
+    variable too
+-   rtpjitterbuffer: More logging when calculating rfc7273 timestamps
+-   rtspsrc: Fix more signals
+-   rtspsrc: Fix accumulation of before-send signal return values
+-   souphttpsrc: Always use the content decoder but set
+    `Accept-Encoding:…
+-   udpsrc: Plug leaks of saddr in error cases
+-   multiudpsink: Fix broken SO_SNDBUF get/set on Windows
+-   v4l2object: Add interlace-mode back to caps for camera
+-   v4l2object: Use default colorimetry if that in caps is unknown
+-   V4l2object: Avoid colorimetry mismatch for streams with invalid
+    colorimetry
+-   v4l2object: Add support for hdr10 stream playback
+-   wavparse: adtl/note/labl chunk parsing fixes
+-   Don’t use volatile to mean atomic (fixes compiler warnings with
+    gcc 11)
+-   1.18.4: build fails with glib 2.67.6 and gcc-11: argument 2 of
+    ‘__atomic_load’ must not be a pointer to a ‘volatile’ type
+
+gst-plugins-bad
+
+-   audiolatency: Use live mode audiotestsrc
+-   audiolatency: Handle audio buffers with invalid duration
+-   ccconverter: fix framerate caps negotiation from non-cdp to cdp
+-   dashdemux: Properly initalize GError, remove duplicate logging call
+-   dashdemux: Log protection events on corresponding pad
+-   dashdemux: fix dash_mpdparser_check_mpd_client_set_methods unit test
+-   h264parse,h265parse: Push parameter set NAL units again per
+    segment-done
+-   h265parse: Fix a typo in get_compatible_profile_caps()
+-   h265parse: don’t invalidate the last PPS when parsing a new SPS
+-   h264parse: improve PPS handling
+-   h2645parser: Catch overflows in AVC/HEVC NAL unit length
+    calculations
+-   interlace: Don’t set field-order field for progressive caps, fixes
+    negotiation issues
+-   interlace: Fix too small buffer size error
+-   jpegparse: Don’t generate timestamp for 0/1 framerates
+-   opencv: fix build error on macOS
+-   openexr: Fix build with OpenEXR 3
+-   openh264enc: fix broken sps/pps header generation and some minor
+    leaks
+-   mpeg2enc: fix interlace-mode detection on input video
+-   mpeg2enc: Only allow 1 pending frame for encoding (fixes unbound
+    memory usage in case encoder can’t keep up with input)
+-   mfvideoenc: Don’t pass 0/1 framerate to MFT
+-   mfvideosrc: Fix for negative MF stride
+-   mfvideosrc: Fix negotiation when interlace-mode is specified
+-   mxfvanc: Handle empty ANC essence
+-   rtmp2src: workaround a GLib race when destroying a
+    GMainContext/GSource
+-   rtpsrc: Plug leak of rtcp_send_addr and fix setting URI back to NULL
+-   rtpsink: Return proper pad from _request_new_pad()
+-   rist: Plug leak of rtcp_send_addr
+-   rtmp2: Use correct size of write macro for param2.
+-   rtmp2/connection: Separate inner from outer cancelling
+-   tsmux: When selecting random PIDs, name the pads according to those
+    PIDs
+-   tsmux: Recheck existing pad PIDs when requesting a new pad with a
+    random pid
+-   tsdemux: fix seek with stop regression
+-   tsdemux: Clear all streams when rewinding, fixes the case where the
+    demuxer sends out partial invalid data downstream after a seek which
+    causes some decoders (such as dvdlpmdec) to error out
+-   v4l2slh264dec: Fix slice header bit size calculation
+-   videoparseutils: Fix for wrong CEA708 minimum size check
+-   waylandsink: Fix for missing initial configure
+-   wpe: Make threaded view singleton creation thread safe
+-   x265: Fix a deadlock when failing to create the x265enc
+-   Don’t use volatile to mean atomic (fixes compiler warnings with
+    gcc 11)
+
+gst-plugins-ugly
+
+-   asfdemux/realmedia: Drop duplicate seek events
+-   Don’t use volatile to mean atomic (fixes compiler warnings with
+    gcc 11)
+
+gst-libav
+
+-   avmux: Blacklist ttml subtitles (fixes crash with ffmpeg >= 4.4)
+-   avmux: fix segfault when a plugin’s long_name is NULL
+-   avviddec: Fix size of linesize parameter
+-   avviddec: Take into account coded_height for pool
+-   avdemux: fix build with FFmpeg 4.4
+
+gst-rtsp-server
+
+-   rtsp-media: Ensure the bus watch is removed during unprepare
+-   rtsp-media: Add one more case to seek avoidance
+-   rtsp-media: Improve skipping trickmode seek
+-   Fix a few memory leaks
+
+gstreamer-vaapi
+
+-   plugins: Demote rank of vaapipostproc and vaapioverlay to match
+    other filters
+-   Don’t use volatile to mean atomic (fixes compiler warnings with
+    gcc 11)
+
+gst-editing-services
+
+-   xml-formatter: Fix allocation size of buffer
+-   framepositioner: Fix runtime warning
+-   Don’t use volatile to mean atomic (fixes compiler warnings with
+    gcc 11)
+
+gst-devtools
+
+-   scenario: Fix EOS handling in seek_forward.scenario
+-   validate-utils: Only modify structure fields that really need
+    updates
+-   Don’t use volatile to mean atomic (fixes compiler warnings with
+    gcc 11)
+
+gst-integration-testsuites
+
+-   validate: Update interlace_deinterlace_alternate to remove
+    field-order from expected caps
+
+gst-build
+
+-   git-update: Make fetching of external repos non-fatal on the CI
+-   gst-env: Windows: Fix looking for cmd_or_ps.ps1 in the wrong
+    directory
+-   Pin gst-plugins-rs subproject to 0.7 branch
+
+Cerbero build tool and packaging changes in 1.18.5
+
+-   cerbero: Add a dotted progress bar for urllib downloads
+-   libunwind: make sure all pkgconfig files get included in the devel
+    package
+-   openssl.recipe: Bump to 1.1.1k
+-   glib: Fix hang on Windows when G_SLICE env is configured
+-   utils: Support latest Debian release names
+-   enums: generate fedora version strings automatically
+-   Rework cmake build system
+-   spandsp: Fix build error with Visual Studio 2019
+
+Contributors to 1.18.5
+
+Alba Mendez, Andoni Morales Alastruey, Antonio Rojas, Bartłomiej
+Kurzeja, Binh Truong, Daniel Knobe, Doug Nazar, Edward Hervey, He
+Junyan, Hou Qi, Jan Alexander Steffens (heftig), Jan Schmidt, Marijn
+Suijten, Mathieu Duponchelle, Matthew Waters, Michael Olbrich, Miguel
+Paris, Nicholas Jackson, Nicolas Dufresne, Nirbheek Chauhan, Olivier
+Crête, Per Förlin, Philippe Normand, Robin Burchell, Ruslan Khamidullin,
+Scott Moreau, Sebastian Dröge, Sergei Kovalev, Seungha Yang, Stéphane
+Cerveau, Steve McDaniel, Thibault Saunier, Tim-Philipp Müller, Víctor
+Manuel Jáquez Leal, Xavier Claessens, Youngsoo Lee,
+
+… and many others who have contributed bug reports, translations, sent
+suggestions or helped testing. Thank you all!
+
+List of merge requests and issues fixed in 1.18.5
+
+-   List of Merge Requests applied in 1.18.5
+-   List of Issues fixed in 1.18.5
+
 Schedule for 1.20
 
 Our next major feature release will be 1.20, and 1.19 will be the
@@ -2886,9 +3190,9 @@ unstable development version leading up to the stable 1.20 release. The
 development of 1.19/1.20 will happen in the git master branch.
 
 The plan for the 1.20 development cycle is yet to be confirmed, but it
-is now expected that feature freeze will take place some time in April
-2021, with the first 1.20 stable release hopefully around April/May
-2021.
+is now expected that feature freeze will take place some time in
+September/October 2021, with the first 1.20 stable release hopefully
+towards the end of October 2021.
 
 1.20 will be backwards-compatible to the stable 1.18, 1.16, 1.14, 1.12,
 1.10, 1.8, 1.6, 1.4, 1.2 and 1.0 release series.
diff --git a/RELEASE b/RELEASE
index 77bebf949..14af7a345 100644
--- a/RELEASE
+++ b/RELEASE
@@ -1,4 +1,4 @@
-This is GStreamer gst-plugins-base 1.18.4.
+This is GStreamer gst-plugins-base 1.18.5.
 
 The GStreamer team is thrilled to announce a new major feature release
 of your favourite cross-platform multimedia framework!
diff --git a/gst-plugins-base.doap b/gst-plugins-base.doap
index df9de2148..06e35d62f 100644
--- a/gst-plugins-base.doap
+++ b/gst-plugins-base.doap
@@ -36,6 +36,16 @@ A wide range of video and audio decoders, encoders, and filters are included.
 
  <release>
   <Version>
+   <revision>1.18.5</revision>
+   <branch>1.18</branch>
+   <name></name>
+   <created>2021-09-08</created>
+   <file-release rdf:resource="https://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-1.18.5.tar.xz" />
+  </Version>
+ </release>
+
+ <release>
+  <Version>
    <revision>1.18.4</revision>
    <branch>1.18</branch>
    <name></name>
diff --git a/meson.build b/meson.build
index 7d93bf426..57a578c51 100644
--- a/meson.build
+++ b/meson.build
@@ -1,5 +1,5 @@
 project('gst-plugins-base', 'c',
-  version : '1.18.4.1',
+  version : '1.18.5',
   meson_version : '>= 0.48',
   default_options : [ 'warning_level=1',
                       'buildtype=debugoptimized' ])