From 9f6fd00db4be850141b3dab0c5e1a6bf371072a3 Mon Sep 17 00:00:00 2001 From: Thomas Vander Stichele Date: Sat, 14 Jan 2006 20:46:25 +0000 Subject: [PATCH] ext/ogg/gstoggmux.c: fix a silly segfault Original commit message from CVS: 2006-01-14 Thomas Vander Stichele * ext/ogg/gstoggmux.c: (gst_ogg_mux_collected): fix a silly segfault --- ChangeLog | 5 +++++ docs/libs/tmpl/gstcolorbalance.sgml | 9 +++++++++ ext/ogg/gstoggmux.c | 5 +++-- 3 files changed, 17 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index d7d413163..962defdec 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2006-01-14 Thomas Vander Stichele + + * ext/ogg/gstoggmux.c: (gst_ogg_mux_collected): + fix a silly segfault + 2006-01-14 Tim-Philipp Müller * docs/libs/gst-plugins-base-libs-docs.sgml: diff --git a/docs/libs/tmpl/gstcolorbalance.sgml b/docs/libs/tmpl/gstcolorbalance.sgml index 7ac9f04e8..ccb0ae227 100644 --- a/docs/libs/tmpl/gstcolorbalance.sgml +++ b/docs/libs/tmpl/gstcolorbalance.sgml @@ -23,6 +23,15 @@ interface for adjusting color balance settings + + + + + +@gstcolorbalance: the object which received the signal. +@arg1: +@arg2: + diff --git a/ext/ogg/gstoggmux.c b/ext/ogg/gstoggmux.c index 9ca808edc..4597ad1cf 100644 --- a/ext/ogg/gstoggmux.c +++ b/ext/ogg/gstoggmux.c @@ -1031,8 +1031,9 @@ gst_ogg_mux_collected (GstCollectPads * pads, GstOggMux * ogg_mux) return GST_FLOW_OK; } - GST_DEBUG_OBJECT (ogg_mux, "best pad %" GST_PTR_FORMAT " (oggpad %p)" - " pulling %" GST_PTR_FORMAT, best->collect.pad, best, ogg_mux->pulling); + if (best) + GST_DEBUG_OBJECT (ogg_mux, "best pad %" GST_PTR_FORMAT " (oggpad %p)" + " pulling %" GST_PTR_FORMAT, best->collect.pad, best, ogg_mux->pulling); if (!best) { /* EOS : FIXME !! We need to handle EOS correctly, and set EOS flags on the ogg pages. */ -- 2.34.1