summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Vander Stichele <thomas@apestaart.org>2004-01-20 13:01:40 +0000
committerThomas Vander Stichele <thomas@apestaart.org>2004-01-20 13:01:40 +0000
commit156163e66af48035631f40237b2d42284bea6339 (patch)
tree69617a371f065d4117e72193de1064ccca843001
parent1454eff178722ecfd9109ebda76f2a3e59ee4411 (diff)
downloadgst-plugins-bad-156163e66af48035631f40237b2d42284bea6339.tar.gz
gst-plugins-bad-156163e66af48035631f40237b2d42284bea6339.tar.bz2
gst-plugins-bad-156163e66af48035631f40237b2d42284bea6339.zip
fix error error
Original commit message from CVS: fix error error
-rw-r--r--ChangeLog5
-rw-r--r--ext/mpeg2enc/gstmpeg2enc.cc4
2 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 973f7e14..1ec53eda 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-01-20 Thomas Vander Stichele <thomas at apestaart dot org>
+
+ * ext/mpeg2enc/gstmpeg2enc.cc:
+ fix error errors.
+
2004-01-20 Ronald Bultje <rbultje@ronald.bitfreak.net>
* ext/divx/gstdivxdec.c: (gst_divxdec_setup), (gst_divxdec_chain):
diff --git a/ext/mpeg2enc/gstmpeg2enc.cc b/ext/mpeg2enc/gstmpeg2enc.cc
index 039fa227..952affaa 100644
--- a/ext/mpeg2enc/gstmpeg2enc.cc
+++ b/ext/mpeg2enc/gstmpeg2enc.cc
@@ -239,7 +239,7 @@ gst_mpeg2enc_loop (GstElement *element)
gst_pad_set_element_private (enc->sinkpad, data);
if (!(caps = GST_PAD_CAPS (enc->sinkpad))) {
- gst_element_error (element, CORE, NEGOTIATION, NULL,
+ gst_element_error (element, CORE, NEGOTIATION, (""),
("format wasn't negotiated before loop function"));
return;
}
@@ -251,7 +251,7 @@ gst_mpeg2enc_loop (GstElement *element)
/* and set caps on other side */
othercaps = enc->encoder->getFormat ();
if (gst_pad_set_explicit_caps (enc->srcpad, othercaps) <= 0) {
- gst_element_error (element, CORE, NEGOTIATION, NULL, NULL);
+ gst_element_error (element, CORE, NEGOTIATION, (""), (""));
delete enc->encoder;
enc->encoder = NULL;
return;