Date: Thu, 15 Sep 2016 19:49:32 +0200 From: "Carlos J. Puga Medina" <cpm@FreeBSD.org> To: Koop Mast <kwm@FreeBSD.org>, ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: Re: svn commit: r422217 - in head/multimedia/gstreamer1-plugins-bad: . files Message-ID: <1473961772.76848.2.camel@FreeBSD.org> In-Reply-To: <201609151730.u8FHUN1e082014@repo.freebsd.org> References: <201609151730.u8FHUN1e082014@repo.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
--=-c8hhMvm7PEPNrSPz2E2z Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Thu, 2016-09-15 at 17:30 +0000, Koop Mast wrote: > Author: kwm > Date: Thu Sep 15 17:30:23 2016 > New Revision: 422217 > URL: https://svnweb.freebsd.org/changeset/ports/422217 >=20 > Log: > =C2=A0 Fix a runtime issue which causes the program to SIGABRT when it > happens. > =C2=A0=C2=A0 > =C2=A0 PR: 212461 > =C2=A0 Submitted by: cpm@ > =C2=A0 Obtained from: gstreamer upstream > =C2=A0 MFH: 2016Q3 >=20 > Added: > =C2=A0 head/multimedia/gstreamer1-plugins-bad/files/ > =C2=A0 head/multimedia/gstreamer1-plugins-bad/files/patch- > 3aee203=C2=A0=C2=A0=C2=A0(contents, props changed) > Modified: > =C2=A0 head/multimedia/gstreamer1-plugins-bad/Makefile >=20 > Modified: head/multimedia/gstreamer1-plugins-bad/Makefile > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D > =3D=3D=3D=3D=3D=3D=3D=3D=3D > --- head/multimedia/gstreamer1-plugins-bad/Makefile Thu Sep 15 > 16:40:17 2016 (r422216) > +++ head/multimedia/gstreamer1-plugins-bad/Makefile Thu Sep 15 > 17:30:23 2016 (r422217) > @@ -1,7 +1,7 @@ > =C2=A0# Created by: Michael Johnson <ahze@FreeBSD.org> > =C2=A0# $FreeBSD$ > =C2=A0 > -PORTREVISION=3D 0 > +PORTREVISION=3D 1 > =C2=A0CATEGORIES=3D multimedia > =C2=A0 > =C2=A0COMMENT=3D GStreamer-plugins that need more quality, testing or > documentation >=20 > Added: head/multimedia/gstreamer1-plugins-bad/files/patch-3aee203 > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D > =3D=3D=3D=3D=3D=3D=3D=3D=3D > --- /dev/null 00:00:00 1970 (empty, because file is > newly added) > +++ head/multimedia/gstreamer1-plugins-bad/files/patch-3aee203=09 > Thu Sep 15 17:30:23 2016 (r422217) > @@ -0,0 +1,55 @@ > +From 3aee2039591421f4cc8757353034daf0e011a9ce Mon Sep 17 00:00:00 > 2001 > +From: =3D?UTF-8?q?Sebastian=3D20Dr=3DC3=3DB6ge?=3D <sebastian@centricula= r.com> > +Date: Thu, 31 Mar 2016 12:20:30 +0300 > +Subject: adaptivedemux: Handle find_stream_for_pad() without > + g_assert_not_reached() if no pad is found > + > +Happens e.g. if a RECONFIGURE event is sent from downstream while > we're > +switching pads at this very moment. The old pad is gone and the > stream has a > +new pad. > + > +https://bugzilla.gnome.org/show_bug.cgi?id=3D764404 > + > +diff --git a/gst-libs/gst/adaptivedemux/gstadaptivedemux.c b/gst- > libs/gst/adaptivedemux/gstadaptivedemux.c > +index dfe7ba7..ba29214 100644 > +--- gst-libs/gst/adaptivedemux/gstadaptivedemux.c > ++++ gst-libs/gst/adaptivedemux/gstadaptivedemux.c > +@@ -1092,7 +1092,6 @@ gst_adaptive_demux_find_stream_for_pad > (GstAdaptiveDemux * demux, GstPad * pad) > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0return stream; > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0} > +=C2=A0=C2=A0=C2=A0} > +-=C2=A0=C2=A0g_assert_not_reached (); > +=C2=A0=C2=A0=C2=A0return NULL; > + } > +=C2=A0 > +@@ -1241,6 +1240,7 @@ gst_adaptive_demux_src_event (GstPad * pad, > GstObject * parent, > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0gboolean update; > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0gboolean ret =3D TRUE; > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0GstSegment oldsegment; > ++=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0GstAdaptiveDemuxStream *stream =3D = NULL; > +=C2=A0 > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0GST_INFO_OBJECT (demux, "Recei= ved seek event"); > +=C2=A0 > +@@ -1318,9 +1318,8 @@ gst_adaptive_demux_src_event (GstPad * pad, > GstObject * parent, > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0* use the one that recei= ved the event as the 'leading' > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0* one to do the snap see= k. > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0*/ > +-=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0if (IS_SNAP_SEEK (flags) && demux_c= lass->stream_seek) { > +-=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0GstAdaptiveDemuxStream = *stream =3D > +-=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0gst_adaptive_demux_find_stream_for_pad (demux, pad); > ++=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0if (IS_SNAP_SEEK (flags) && demux_c= lass->stream_seek && > (stream =3D > ++=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0gst_adaptive_demux_find_stream_for_pad (demux, pad))) > { > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0GstClockTime ts; > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0GstSeekFlags strea= m_seek_flags =3D flags; > +=C2=A0 > +@@ -1359,6 +1358,7 @@ gst_adaptive_demux_src_event (GstPad * pad, > GstObject * parent, > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0GST_DEBUG_OBJECT (= demux, "Adapted snap seek to %" > GST_PTR_FORMAT, > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0event); > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0} > ++=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0stream =3D NULL; > +=C2=A0 > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0gst_segment_do_seek (&demux->s= egment, rate, format, flags, > start_type, > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0start,= stop_type, stop, &update); > +--=C2=A0 > +cgit v0.10.2 > + >=20 Thanks for the push, Koop! --=20 Carlos Jacobo Puga Medina <cpm@FreeBSD.org> PGP fingerprint =3D C60E 9497 5302 793B CC2D BB89 A1F3 5D66 E6D0 5453 --=-c8hhMvm7PEPNrSPz2E2z Content-Type: application/pgp-signature; name="signature.asc" Content-Description: This is a digitally signed message part Content-Transfer-Encoding: 7bit -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQF8BAABCgBmBQJX2t8uXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRDNjBFOTQ5NzUzMDI3OTNCQ0MyREJCODlB MUYzNUQ2NkU2RDA1NDUzAAoJEKHzXWbm0FRTWRAIAK/MhAgLvFGdyF/D0l+tVIdY qGzwcLCH1hDpWkMGNtEKwEcCfnHY9xYSmoyStMbuFPAI+fUk+lGCowF2sE/WJXgr cibEKK1aydEmPL5ZOOp1PNyQSy8cDBtPAB9nAPxbfxWrxrLQghABp2ZBAIWn+fKi HVyGY+9b9shvLcLACYflyBFkqXm4P8eq3tTSuM/Vj3q5Yb2/NdnFrpc2hK19IHq7 JnH8Epo+3hDGgZlxOCAZgDe46wg/rH9fJOw5DM1WN45GZ+/MGwt8zFIQKKQeYLpm szuSo/wHlg9q+T5Kgh4tBLje4vseIXZiBNt76Dl/m1mlbiL9UevlcZS6BPi8iHw= =+6na -----END PGP SIGNATURE----- --=-c8hhMvm7PEPNrSPz2E2z--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?1473961772.76848.2.camel>