Skip to content

Commit

Permalink
Merge branch 'hotfix/avoid-send-renegotiation-event-when-caps-remaing…
Browse files Browse the repository at this point in the history
…-same'
  • Loading branch information
ronnyjimenez committed May 4, 2020
2 parents da5da69 + 0afc8b3 commit 7e1079a
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 3 deletions.
2 changes: 1 addition & 1 deletion configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ dnl please read gstreamer/docs/random/autotools before changing this file
dnl initialize autoconf
dnl releases only do -Wall, git and prerelease does -Werror too
dnl use a three digit version number for releases, and four for git/pre
AC_INIT([GstInterpipe],[1.1.0],
AC_INIT([GstInterpipe],[1.1.1],
[http://www.github.com/RidgeRun/gst-interpipe-1.0],
[gst-interpipe],
[http://developer.ridgerun.com/wiki/index.php?title=GstInterpipe])
Expand Down
10 changes: 10 additions & 0 deletions gst-interpipe.doap
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,16 @@ GstInterpipe is a plug-in with two elements which allow the communication betwee
</GitRepository>
</repository>

<release>
<Version>
<revision>1.1.1</revision>
<branch>master</branch>
<name></name>
<created>2020-04-28</created>
<file-release rdf:resource="" />
</Version>
</release>

<release>
<Version>
<revision>1.1.0</revision>
Expand Down
6 changes: 4 additions & 2 deletions gst/interpipe/gstinterpipesink.c
Original file line number Diff line number Diff line change
Expand Up @@ -746,8 +746,10 @@ gst_inter_pipe_sink_add_listener (GstInterPipeINode * iface,

has_listeners = 0 != g_hash_table_size (listeners);

if (!sink->caps_negotiated && !has_listeners) {
if (!gst_pad_push_event (GST_INTER_PIPE_SINK_PAD (sink),
if (!sink->caps_negotiated && !has_listeners
&& !gst_caps_is_equal (srccaps, sinkcaps)) {

if (!gst_pad_push_event (GST_INTER_PIPE_SINK_PAD (sink),
gst_event_new_reconfigure ()))
goto reconfigure_event_error;

Expand Down

0 comments on commit 7e1079a

Please sign in to comment.