diff options
30 files changed, 166 insertions, 33 deletions
diff --git a/meson.build b/meson.build index ea9e193a96..a9f89e6467 100644 --- a/meson.build +++ b/meson.build @@ -1,5 +1,5 @@ project('gstreamer-full', 'c', - version : '1.22.12', + version : '1.22.12.1', meson_version : '>= 0.62.0', default_options : ['buildtype=debugoptimized', # Needed due to https://github.com/mesonbuild/meson/issues/1889, diff --git a/subprojects/gst-devtools/meson.build b/subprojects/gst-devtools/meson.build index 313f9f01ca..8e317a36d3 100644 --- a/subprojects/gst-devtools/meson.build +++ b/subprojects/gst-devtools/meson.build @@ -1,5 +1,5 @@ project('gst-devtools', 'c', - version : '1.22.12', + version : '1.22.12.1', meson_version : '>= 0.62', default_options : [ 'warning_level=1', 'c_std=gnu99', diff --git a/subprojects/gst-docs/meson.build b/subprojects/gst-docs/meson.build index 96fc08a691..9980ceb74a 100644 --- a/subprojects/gst-docs/meson.build +++ b/subprojects/gst-docs/meson.build @@ -1,5 +1,5 @@ project('GStreamer manuals and tutorials', 'c', - version: '1.22.12', + version: '1.22.12.1', meson_version : '>= 0.62') hotdoc_p = find_program('hotdoc') diff --git a/subprojects/gst-editing-services/meson.build b/subprojects/gst-editing-services/meson.build index 25decb8f31..9009568b73 100644 --- a/subprojects/gst-editing-services/meson.build +++ b/subprojects/gst-editing-services/meson.build @@ -1,5 +1,5 @@ project('gst-editing-services', 'c', - version : '1.22.12', + version : '1.22.12.1', meson_version : '>= 0.62', default_options : [ 'warning_level=1', 'buildtype=debugoptimized' ]) diff --git a/subprojects/gst-examples/meson.build b/subprojects/gst-examples/meson.build index affd66367f..1c0c3437db 100644 --- a/subprojects/gst-examples/meson.build +++ b/subprojects/gst-examples/meson.build @@ -1,4 +1,4 @@ -project('gst-examples', 'c', version : '1.22.12', license : 'LGPL') +project('gst-examples', 'c', version : '1.22.12.1', license : 'LGPL') cc = meson.get_compiler('c') m_dep = cc.find_library('m', required : false) diff --git a/subprojects/gst-integration-testsuites/meson.build b/subprojects/gst-integration-testsuites/meson.build index eca00343e4..539bb8e58e 100644 --- a/subprojects/gst-integration-testsuites/meson.build +++ b/subprojects/gst-integration-testsuites/meson.build @@ -1 +1 @@ -project('gst-integration-testsuites', [], version: '1.22.12', meson_version : '>= 0.62', license: 'LGPL') +project('gst-integration-testsuites', [], version: '1.22.12.1', meson_version : '>= 0.62', license: 'LGPL') diff --git a/subprojects/gst-libav/ext/libav/gstavviddec.c b/subprojects/gst-libav/ext/libav/gstavviddec.c index fff15893b2..257ee6ed2d 100644 --- a/subprojects/gst-libav/ext/libav/gstavviddec.c +++ b/subprojects/gst-libav/ext/libav/gstavviddec.c @@ -1937,7 +1937,7 @@ gst_ffmpegviddec_video_frame (GstFFMpegVidDec * ffmpegdec, while (l) { GstVideoCodecFrame *tmp = l->data; - if (tmp == frame) + if (tmp == out_frame) old = FALSE; if (old && GST_VIDEO_CODEC_FRAME_IS_DECODE_ONLY (tmp)) { diff --git a/subprojects/gst-libav/meson.build b/subprojects/gst-libav/meson.build index 656680a871..b719c879dd 100644 --- a/subprojects/gst-libav/meson.build +++ b/subprojects/gst-libav/meson.build @@ -1,5 +1,5 @@ project('gst-libav', 'c', - version : '1.22.12', + version : '1.22.12.1', meson_version : '>= 0.62', default_options : [ 'warning_level=1', 'buildtype=debugoptimized' ]) diff --git a/subprojects/gst-omx/meson.build b/subprojects/gst-omx/meson.build index 5ff8731607..031a659569 100644 --- a/subprojects/gst-omx/meson.build +++ b/subprojects/gst-omx/meson.build @@ -1,5 +1,5 @@ project('gst-omx', 'c', - version : '1.22.12', + version : '1.22.12.1', meson_version : '>= 0.62', default_options : [ 'warning_level=1', 'buildtype=debugoptimized' ]) diff --git a/subprojects/gst-plugins-bad/meson.build b/subprojects/gst-plugins-bad/meson.build index aa2f86ca5b..c79c3fddb5 100644 --- a/subprojects/gst-plugins-bad/meson.build +++ b/subprojects/gst-plugins-bad/meson.build @@ -1,5 +1,5 @@ project('gst-plugins-bad', 'c', 'cpp', - version : '1.22.12', + version : '1.22.12.1', meson_version : '>= 0.62', default_options : [ 'warning_level=1', 'buildtype=debugoptimized' ]) diff --git a/subprojects/gst-plugins-bad/tests/check/elements/audiovisualizer.c b/subprojects/gst-plugins-bad/tests/check/elements/audiovisualizer.c new file mode 100644 index 0000000000..1da3521584 --- /dev/null +++ b/subprojects/gst-plugins-bad/tests/check/elements/audiovisualizer.c @@ -0,0 +1,106 @@ +/* GStreamer + * + * Copyright (C) 2024 Piotr Brzeziński <piotr@centricular.com> + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this library; if not, write to the + * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, + * Boston, MA 02110-1301, USA. + */ + +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + +#include <gst/check/gstcheck.h> + +static void +eos_cb (GstBus * bus, GstMessage * message, GMainLoop * loop) +{ + GST_DEBUG ("Received EOS"); + g_main_loop_quit (loop); +} + +static void +error_cb (GstBus * bus, GstMessage * message, GMainLoop * loop) +{ + GError *err = NULL; + gchar *dbg = NULL; + + gst_message_parse_error (message, &err, &dbg); + g_error ("ERROR: %s\n%s\n", err->message, dbg); +} + +static void +test_element (const gchar * element) +{ + GstElement *pipeline; + GstBus *bus; + GError *error = NULL; + gchar *pipe_str; + GMainLoop *loop; + + pipe_str = + g_strdup_printf + ("audiotestsrc num-buffers=20 ! audio/x-raw,format=S16LE,channels=2 ! %s ! fakesink", + element); + + pipeline = gst_parse_launch (pipe_str, &error); + fail_unless (pipeline != NULL, "Could not create pipeline: %s", + error->message); + g_free (pipe_str); + + loop = g_main_loop_new (NULL, FALSE); + + bus = gst_element_get_bus (pipeline); + fail_if (bus == NULL); + gst_bus_add_signal_watch (bus); + g_signal_connect (bus, "message::eos", (GCallback) eos_cb, loop); + g_signal_connect (bus, "message::error", (GCallback) error_cb, loop); + + gst_element_set_state (pipeline, GST_STATE_PLAYING); + g_main_loop_run (loop); + gst_element_set_state (pipeline, GST_STATE_NULL); + + g_main_loop_unref (loop); + gst_object_unref (bus); + gst_object_unref (pipeline); +} + +GST_START_TEST (test_simple_pipelines) +{ + /* Simple pipeline tests to see if these elements run at all. + * Will help catch breakages like https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6800. */ + test_element ("wavescope"); + test_element ("spacescope"); + test_element ("spectrascope"); + test_element ("synaescope"); +} + +GST_END_TEST; + +static Suite * +audiovisualizer_suite (void) +{ + Suite *s = suite_create ("audiovisualizer"); + TCase *tc_chain = tcase_create ("general"); + + suite_add_tcase (s, tc_chain); +#ifndef GST_DISABLE_PARSE + tcase_add_test (tc_chain, test_simple_pipelines); +#endif + + return s; +} + +GST_CHECK_MAIN (audiovisualizer); diff --git a/subprojects/gst-plugins-bad/tests/check/meson.build b/subprojects/gst-plugins-bad/tests/check/meson.build index 590135899b..abe6edf7df 100644 --- a/subprojects/gst-plugins-bad/tests/check/meson.build +++ b/subprojects/gst-plugins-bad/tests/check/meson.build @@ -25,6 +25,7 @@ base_tests = [ [['elements/aesdec.c'], not aes_dep.found(), [aes_dep]], [['elements/aiffparse.c'], get_option('aiff').disabled()], [['elements/asfmux.c'], get_option('asfmux').disabled()], + [['elements/audiovisualizer.c'], get_option('audiovisualizers').disabled()], [['elements/autoconvert.c'], get_option('autoconvert').disabled()], [['elements/autovideoconvert.c'], get_option('autoconvert').disabled()], [['elements/avwait.c'], get_option('timecode').disabled()], diff --git a/subprojects/gst-plugins-base/gst-libs/gst/pbutils/gstaudiovisualizer.c b/subprojects/gst-plugins-base/gst-libs/gst/pbutils/gstaudiovisualizer.c index 180071bbb1..e46af8506d 100644 --- a/subprojects/gst-plugins-base/gst-libs/gst/pbutils/gstaudiovisualizer.c +++ b/subprojects/gst-plugins-base/gst-libs/gst/pbutils/gstaudiovisualizer.c @@ -1181,6 +1181,7 @@ gst_audio_visualizer_chain (GstPad * pad, GstObject * parent, } } + gst_buffer_remove_all_memory (inbuf); gst_buffer_copy_into (inbuf, databuf, GST_BUFFER_COPY_MEMORY, 0, sbpf); gst_buffer_unref (databuf); diff --git a/subprojects/gst-plugins-base/gst/videotestsrc/gstvideotestsrc.c b/subprojects/gst-plugins-base/gst/videotestsrc/gstvideotestsrc.c index 71124632d8..342183bd9b 100644 --- a/subprojects/gst-plugins-base/gst/videotestsrc/gstvideotestsrc.c +++ b/subprojects/gst-plugins-base/gst/videotestsrc/gstvideotestsrc.c @@ -112,6 +112,8 @@ G_DEFINE_TYPE (GstVideoTestSrc, gst_video_test_src, GST_TYPE_PUSH_SRC); GST_ELEMENT_REGISTER_DEFINE (videotestsrc, "videotestsrc", GST_RANK_NONE, GST_TYPE_VIDEO_TEST_SRC); +static void gst_video_test_src_finalize (GObject * object); + static void gst_video_test_src_set_pattern (GstVideoTestSrc * videotestsrc, int pattern_type); static void gst_video_test_src_set_property (GObject * object, guint prop_id, @@ -246,6 +248,7 @@ gst_video_test_src_class_init (GstVideoTestSrcClass * klass) gobject_class->set_property = gst_video_test_src_set_property; gobject_class->get_property = gst_video_test_src_get_property; + gobject_class->finalize = gst_video_test_src_finalize; g_object_class_install_property (gobject_class, PROP_PATTERN, g_param_spec_enum ("pattern", "Pattern", @@ -405,6 +408,15 @@ gst_video_test_src_init (GstVideoTestSrc * src) src->motion_type = DEFAULT_MOTION_TYPE; src->flip = DEFAULT_FLIP; + g_mutex_init (&src->cache_lock); +} + +static void +gst_video_test_src_finalize (GObject * object) +{ + GstVideoTestSrc *src = GST_VIDEO_TEST_SRC (object); + g_mutex_clear (&src->cache_lock); + G_OBJECT_CLASS (parent_class)->finalize (object); } static GstCaps * @@ -744,9 +756,11 @@ gst_video_test_src_set_property (GObject * object, guint prop_id, } if (invalidate) { + g_mutex_lock (&src->cache_lock); /* Property change invalidated the current pattern - check if it's static now or not */ src->have_static_pattern = gst_video_test_src_is_static_pattern (src); gst_clear_buffer (&src->cached); + g_mutex_unlock (&src->cache_lock); } } @@ -1026,7 +1040,9 @@ gst_video_test_src_setcaps (GstBaseSrc * bsrc, GstCaps * caps) videotestsrc->running_time = 0; videotestsrc->n_frames = 0; + g_mutex_lock (&videotestsrc->cache_lock); gst_clear_buffer (&videotestsrc->cached); + g_mutex_unlock (&videotestsrc->cache_lock); GST_OBJECT_UNLOCK (videotestsrc); @@ -1262,12 +1278,15 @@ gst_video_test_src_fill (GstPushSrc * psrc, GstBuffer * buffer) if (src->have_static_pattern) { GstVideoFrame sframe, dframe; + g_mutex_lock (&src->cache_lock); if (src->cached == NULL) { src->cached = gst_buffer_new_allocate (NULL, src->info.size, NULL); ret = fill_image (GST_PUSH_SRC (src), src->cached); - if (G_UNLIKELY (ret != GST_FLOW_OK)) + if (G_UNLIKELY (ret != GST_FLOW_OK)) { + g_mutex_unlock (&src->cache_lock); goto fill_failed; + } } else { GST_LOG_OBJECT (src, "Reusing cached pattern buffer"); } @@ -1279,11 +1298,14 @@ gst_video_test_src_fill (GstPushSrc * psrc, GstBuffer * buffer) gst_video_frame_map (&sframe, &src->info, src->cached, GST_MAP_READ); gst_video_frame_map (&dframe, &src->info, buffer, GST_MAP_WRITE); - if (!gst_video_frame_copy (&dframe, &sframe)) + if (!gst_video_frame_copy (&dframe, &sframe)) { + g_mutex_unlock (&src->cache_lock); goto copy_failed; + } gst_video_frame_unmap (&sframe); gst_video_frame_unmap (&dframe); + g_mutex_unlock (&src->cache_lock); } else { ret = fill_image (GST_PUSH_SRC (src), buffer); if (G_UNLIKELY (ret != GST_FLOW_OK)) @@ -1383,7 +1405,9 @@ gst_video_test_src_stop (GstBaseSrc * basesrc) src->n_lines = 0; src->lines = NULL; + g_mutex_lock (&src->cache_lock); gst_clear_buffer (&src->cached); + g_mutex_unlock (&src->cache_lock); return TRUE; } diff --git a/subprojects/gst-plugins-base/gst/videotestsrc/gstvideotestsrc.h b/subprojects/gst-plugins-base/gst/videotestsrc/gstvideotestsrc.h index e0a2dad9b4..08b067f09c 100644 --- a/subprojects/gst-plugins-base/gst/videotestsrc/gstvideotestsrc.h +++ b/subprojects/gst-plugins-base/gst/videotestsrc/gstvideotestsrc.h @@ -209,6 +209,7 @@ struct _GstVideoTestSrc { /* cached buffer used for static patterns that don't change */ GstBuffer *cached; + GMutex cache_lock; gboolean have_static_pattern; }; diff --git a/subprojects/gst-plugins-base/meson.build b/subprojects/gst-plugins-base/meson.build index 194de8c231..778389dca4 100644 --- a/subprojects/gst-plugins-base/meson.build +++ b/subprojects/gst-plugins-base/meson.build @@ -1,5 +1,5 @@ project('gst-plugins-base', 'c', - version : '1.22.12', + version : '1.22.12.1', meson_version : '>= 0.62', default_options : [ 'warning_level=1', 'buildtype=debugoptimized' ]) diff --git a/subprojects/gst-plugins-good/docs/gst_plugins_cache.json b/subprojects/gst-plugins-good/docs/gst_plugins_cache.json index 54633e6168..3a3b1558af 100644 --- a/subprojects/gst-plugins-good/docs/gst_plugins_cache.json +++ b/subprojects/gst-plugins-good/docs/gst_plugins_cache.json @@ -7027,7 +7027,7 @@ "construct": false, "construct-only": false, "controllable": false, - "default": "GStreamer 1.22.12 FLV muxer", + "default": "GStreamer 1.22.12.1 FLV muxer", "mutable": "null", "readable": true, "type": "gchararray", @@ -7039,7 +7039,7 @@ "construct": false, "construct-only": false, "controllable": false, - "default": "GStreamer 1.22.12 FLV muxer", + "default": "GStreamer 1.22.12.1 FLV muxer", "mutable": "null", "readable": true, "type": "gchararray", @@ -21257,7 +21257,7 @@ "construct": false, "construct-only": false, "controllable": false, - "default": "GStreamer/1.22.12", + "default": "GStreamer/1.22.12.1", "mutable": "null", "readable": true, "type": "gchararray", @@ -23253,7 +23253,7 @@ "construct": false, "construct-only": false, "controllable": false, - "default": "GStreamer souphttpsrc 1.22.12 ", + "default": "GStreamer souphttpsrc 1.22.12.1 ", "mutable": "null", "readable": true, "type": "gchararray", diff --git a/subprojects/gst-plugins-good/meson.build b/subprojects/gst-plugins-good/meson.build index 22689dfdbd..ec241da97e 100644 --- a/subprojects/gst-plugins-good/meson.build +++ b/subprojects/gst-plugins-good/meson.build @@ -1,5 +1,5 @@ project('gst-plugins-good', 'c', - version : '1.22.12', + version : '1.22.12.1', meson_version : '>= 0.62', default_options : [ 'warning_level=1', 'buildtype=debugoptimized' ]) diff --git a/subprojects/gst-plugins-rs.wrap b/subprojects/gst-plugins-rs.wrap index 97d01b631f..f4d0b23f8d 100644 --- a/subprojects/gst-plugins-rs.wrap +++ b/subprojects/gst-plugins-rs.wrap @@ -2,4 +2,4 @@ directory=gst-plugins-rs url=https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs.git push-url=git@gitlab.freedesktop.org:gstreamer/gst-plugins-rs.git -revision=gstreamer-1.22.12 +revision=0.9 diff --git a/subprojects/gst-plugins-ugly/meson.build b/subprojects/gst-plugins-ugly/meson.build index d26620fea6..285252ecc3 100644 --- a/subprojects/gst-plugins-ugly/meson.build +++ b/subprojects/gst-plugins-ugly/meson.build @@ -1,5 +1,5 @@ project('gst-plugins-ugly', 'c', - version : '1.22.12', + version : '1.22.12.1', meson_version : '>= 0.62', default_options : [ 'warning_level=1', 'buildtype=debugoptimized' ]) diff --git a/subprojects/gst-python/meson.build b/subprojects/gst-python/meson.build index 4a18faf42a..df6f797ea2 100644 --- a/subprojects/gst-python/meson.build +++ b/subprojects/gst-python/meson.build @@ -1,5 +1,5 @@ project('gst-python', 'c', - version : '1.22.12', + version : '1.22.12.1', meson_version : '>= 0.62', default_options : [ 'warning_level=1', 'c_std=gnu99', diff --git a/subprojects/gst-rtsp-server/docs/plugins/gst_plugins_cache.json b/subprojects/gst-rtsp-server/docs/plugins/gst_plugins_cache.json index c5ef17a44f..6efc48d6fb 100644 --- a/subprojects/gst-rtsp-server/docs/plugins/gst_plugins_cache.json +++ b/subprojects/gst-rtsp-server/docs/plugins/gst_plugins_cache.json @@ -333,7 +333,7 @@ "construct": false, "construct-only": false, "controllable": false, - "default": "GStreamer/1.22.12", + "default": "GStreamer/1.22.12.1", "mutable": "null", "readable": true, "type": "gchararray", diff --git a/subprojects/gst-rtsp-server/meson.build b/subprojects/gst-rtsp-server/meson.build index ad815f78a4..34fd6b07fa 100644 --- a/subprojects/gst-rtsp-server/meson.build +++ b/subprojects/gst-rtsp-server/meson.build @@ -1,5 +1,5 @@ project('gst-rtsp-server', 'c', - version : '1.22.12', + version : '1.22.12.1', meson_version : '>= 0.62', default_options : ['warning_level=1', 'buildtype=debugoptimized']) diff --git a/subprojects/gstreamer-sharp/meson.build b/subprojects/gstreamer-sharp/meson.build index 451708f4f2..1d072c42b7 100644 --- a/subprojects/gstreamer-sharp/meson.build +++ b/subprojects/gstreamer-sharp/meson.build @@ -1,4 +1,4 @@ -project('gstreamer-sharp', ['cs', 'c'], version: '1.22.12', +project('gstreamer-sharp', ['cs', 'c'], version: '1.22.12.1', meson_version : '>= 0.62', license: 'LGPL') if host_machine.system() == 'osx' diff --git a/subprojects/gstreamer-sharp/sources/generated/Gst.PbUtils/Constants.cs b/subprojects/gstreamer-sharp/sources/generated/Gst.PbUtils/Constants.cs index dd5aafdf3d..0b13b47be2 100644 --- a/subprojects/gstreamer-sharp/sources/generated/Gst.PbUtils/Constants.cs +++ b/subprojects/gstreamer-sharp/sources/generated/Gst.PbUtils/Constants.cs @@ -19,7 +19,7 @@ namespace Gst.PbUtils { public const int PLUGINS_BASE_VERSION_MAJOR = 1; public const int PLUGINS_BASE_VERSION_MICRO = 12; public const int PLUGINS_BASE_VERSION_MINOR = 22; - public const int PLUGINS_BASE_VERSION_NANO = 0; + public const int PLUGINS_BASE_VERSION_NANO = 1; #endregion } } diff --git a/subprojects/gstreamer-sharp/sources/generated/Gst/Constants.cs b/subprojects/gstreamer-sharp/sources/generated/Gst/Constants.cs index c55943ca1a..e2cc9026e6 100644 --- a/subprojects/gstreamer-sharp/sources/generated/Gst/Constants.cs +++ b/subprojects/gstreamer-sharp/sources/generated/Gst/Constants.cs @@ -172,7 +172,7 @@ namespace Gst { public const int VERSION_MAJOR = 1; public const int VERSION_MICRO = 12; public const int VERSION_MINOR = 22; - public const int VERSION_NANO = 0; + public const int VERSION_NANO = 1; #endregion } } diff --git a/subprojects/gstreamer-sharp/sources/generated/gstreamer-sharp-api.xml b/subprojects/gstreamer-sharp/sources/generated/gstreamer-sharp-api.xml index 17052a8f3d..605f4d1222 100644 --- a/subprojects/gstreamer-sharp/sources/generated/gstreamer-sharp-api.xml +++ b/subprojects/gstreamer-sharp/sources/generated/gstreamer-sharp-api.xml @@ -12130,7 +12130,7 @@ <constant value="1" ctype="gint" gtype="gint" name="VERSION_MAJOR" /> <constant value="12" ctype="gint" gtype="gint" name="VERSION_MICRO" /> <constant value="22" ctype="gint" gtype="gint" name="VERSION_MINOR" /> - <constant value="0" ctype="gint" gtype="gint" name="VERSION_NANO" /> + <constant value="1" ctype="gint" gtype="gint" name="VERSION_NANO" /> </object> <class name="Parse" cname="GstParse" disable_void_ctor="1"> <method name="ParseBinFromDescription" cname="gst_parse_bin_from_description" shared="true"> @@ -21585,7 +21585,7 @@ <constant value="1" ctype="gint" gtype="gint" name="PLUGINS_BASE_VERSION_MAJOR" /> <constant value="12" ctype="gint" gtype="gint" name="PLUGINS_BASE_VERSION_MICRO" /> <constant value="22" ctype="gint" gtype="gint" name="PLUGINS_BASE_VERSION_MINOR" /> - <constant value="0" ctype="gint" gtype="gint" name="PLUGINS_BASE_VERSION_NANO" /> + <constant value="1" ctype="gint" gtype="gint" name="PLUGINS_BASE_VERSION_NANO" /> </object> </namespace> <namespace name="Gst.Rtp" library="gstrtp-1.0-0.dll"> diff --git a/subprojects/gstreamer-vaapi/meson.build b/subprojects/gstreamer-vaapi/meson.build index c7c8a25929..89f6c5b312 100644 --- a/subprojects/gstreamer-vaapi/meson.build +++ b/subprojects/gstreamer-vaapi/meson.build @@ -1,5 +1,5 @@ project('gstreamer-vaapi', 'c', - version : '1.22.12', + version : '1.22.12.1', meson_version : '>= 0.62', default_options : [ 'warning_level=1', 'buildtype=debugoptimized' ]) diff --git a/subprojects/gstreamer/meson.build b/subprojects/gstreamer/meson.build index ce6b92a331..68e4316882 100644 --- a/subprojects/gstreamer/meson.build +++ b/subprojects/gstreamer/meson.build @@ -1,5 +1,5 @@ project('gstreamer', 'c', - version : '1.22.12', + version : '1.22.12.1', meson_version : '>= 0.62', default_options : [ 'warning_level=1', 'buildtype=debugoptimized' ]) diff --git a/subprojects/gstreamer/tests/check/gst/gststructure.c b/subprojects/gstreamer/tests/check/gst/gststructure.c index 21ad40a236..16eff26349 100644 --- a/subprojects/gstreamer/tests/check/gst/gststructure.c +++ b/subprojects/gstreamer/tests/check/gst/gststructure.c @@ -424,7 +424,7 @@ GST_START_TEST (test_structure_new) GstStructure *s; GError *e; GQuark domain; - gboolean bool; + gboolean get_bool; gint num, den; GstClockTime clocktime; guint64 uint64; @@ -448,8 +448,8 @@ GST_START_TEST (test_structure_new) fail_if (gst_structure_has_field (s, "key")); fail_unless_equals_int (gst_structure_n_fields (s), 4); - fail_unless (gst_structure_get_boolean (s, "bool", &bool)); - fail_unless (bool); + fail_unless (gst_structure_get_boolean (s, "bool", &get_bool)); + fail_unless (get_bool); fail_unless (gst_structure_get_fraction (s, "fraction", &num, &den)); fail_unless_equals_int (num, 1); |