summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Vander Stichele <thomas@apestaart.org>2004-02-16 11:45:32 +0000
committerThomas Vander Stichele <thomas@apestaart.org>2004-02-16 11:45:32 +0000
commit0f003d87b32712bfaee67694bc3126839f53124c (patch)
tree03886edcb48611e5fa4c98ac2c07a5ea64087df7
parent2b5dba5de484187e8aab8653b2c60442889b1d88 (diff)
downloadgstreamer-plugins-base-0f003d87b32712bfaee67694bc3126839f53124c.tar.gz
throw error instead of assertion
Original commit message from CVS: throw error instead of assertion
-rw-r--r--ChangeLog5
-rw-r--r--gst/audioconvert/gstaudioconvert.c7
2 files changed, 11 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 36288f10f..287d92e99 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-02-16 Thomas Vander Stichele <thomas at apestaart dot org>
+
+ * gst/audioconvert/gstaudioconvert.c: (gst_audio_convert_chain):
+ throw error when not negotiated instead of asserting
+
2004-02-15 Julien MOUTTE <julien@moutte.net>
* gst/switch/gstswitch.c: (gst_switch_loop): More fixes for
diff --git a/gst/audioconvert/gstaudioconvert.c b/gst/audioconvert/gstaudioconvert.c
index 6d6b9414e..3ef509f0c 100644
--- a/gst/audioconvert/gstaudioconvert.c
+++ b/gst/audioconvert/gstaudioconvert.c
@@ -216,7 +216,12 @@ gst_audio_convert_chain (GstPad *pad, GstData *data)
return;
}
- g_assert (gst_pad_is_negotiated (this->sink));
+ if (!gst_pad_is_negotiated (this->sink))
+ {
+ GST_ELEMENT_ERROR (this, CORE, NEGOTIATION, NULL,
+ ("Sink pad not negotiated before chain function"));
+ return;
+ }
if (!gst_pad_is_negotiated (this->src)) {
gst_data_unref (data);
return;