Skip to content

Commit 814982e

Browse files
committed
Merge branch 'hotfix/add-new-event-callback'
2 parents cd83b0a + f0f3b8e commit 814982e

File tree

4 files changed

+11
-6
lines changed

4 files changed

+11
-6
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ Wiki](http://developer.ridgerun.com/wiki/index.php?title=GstInterpipe)
1818
The API reference is uploaded to [GitHub's project
1919
page](http://ridgerun.github.io/gst-interpipe/).
2020

21-
GstInterpipe copyright (C) 2016 RidgeRun LLC
21+
GstInterpipe copyright (C) 2016-2022 RidgeRun LLC
2222

2323
This GStreamer plug-in is free software; you can redistribute it
2424
and/or modify it under the terms of the GNU Lesser General Public

configure.ac

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ dnl please read gstreamer/docs/random/autotools before changing this file
66
dnl initialize autoconf
77
dnl releases only do -Wall, git and prerelease does -Werror too
88
dnl use a three digit version number for releases, and four for git/pre
9-
AC_INIT([GstInterpipe],[1.1.7],
9+
AC_INIT([GstInterpipe],[1.1.8],
1010
[http://www.github.com/RidgeRun/gst-interpipe-1.0],
1111
[gst-interpipe],
1212
[http://developer.ridgerun.com/wiki/index.php?title=GstInterpipe])

gst/interpipe/gstinterpipesink.c

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -209,6 +209,11 @@ gst_inter_pipe_sink_init (GstInterPipeSink * sink)
209209

210210
g_mutex_init (&sink->listeners_mutex);
211211

212+
/* Set the struct buffer to 0's so if in the future more callbacks are added
213+
* does not cause a segmentation fault down the line
214+
*/
215+
memset (&callbacks, 0, sizeof (callbacks));
216+
212217
/* AppSink callbacks */
213218
callbacks.eos = GST_DEBUG_FUNCPTR (gst_inter_pipe_sink_eos);
214219
callbacks.new_sample = GST_DEBUG_FUNCPTR (gst_inter_pipe_sink_new_buffer);
@@ -220,7 +225,7 @@ gst_inter_pipe_sink_init (GstInterPipeSink * sink)
220225
gst_base_sink_set_sync (GST_BASE_SINK (sink), FALSE);
221226
gst_app_sink_set_max_buffers (GST_APP_SINK (sink), 3);
222227

223-
/* When a change in the interpipesink name happens, the callback function
228+
/* When a change in the interpipesink name happens, the callback function
224229
will update the node name and the nodes list */
225230
g_object_notify (G_OBJECT (sink), "name");
226231

@@ -747,9 +752,9 @@ gst_inter_pipe_sink_add_listener (GstInterPipeINode * iface,
747752
has_listeners = 0 != g_hash_table_size (listeners);
748753

749754
if (!sink->caps_negotiated && !has_listeners
750-
&& !gst_caps_is_equal (srccaps, sinkcaps)) {
755+
&& !gst_caps_is_equal (srccaps, sinkcaps)) {
751756

752-
if (!gst_pad_push_event (GST_INTER_PIPE_SINK_PAD (sink),
757+
if (!gst_pad_push_event (GST_INTER_PIPE_SINK_PAD (sink),
753758
gst_event_new_reconfigure ()))
754759
goto reconfigure_event_error;
755760

meson.build

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
project('gst-interpipes', 'c',
2-
version : '1.1.7',
2+
version : '1.1.8',
33
meson_version : '>= 0.50',)
44

55
gst_interpipes_version = meson.project_version()

0 commit comments

Comments
 (0)