summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Vander Stichele <thomas@apestaart.org>2004-01-19 10:00:01 +0000
committerThomas Vander Stichele <thomas@apestaart.org>2004-01-19 10:00:01 +0000
commit088c8da66f098029d547d05fb27bc41b1afb3ac5 (patch)
tree1a09eeadb1eaafd047651cb3092077baf81ecdc0
parentaf8dc33f90854d98f222058ef43b5b26fa9a7b59 (diff)
downloadgst-plugins-bad-088c8da66f098029d547d05fb27bc41b1afb3ac5.tar.gz
gst-plugins-bad-088c8da66f098029d547d05fb27bc41b1afb3ac5.tar.bz2
gst-plugins-bad-088c8da66f098029d547d05fb27bc41b1afb3ac5.zip
parenthising NULL
Original commit message from CVS: parenthising NULL
-rw-r--r--ChangeLog6
-rw-r--r--gst/modplug/gstmodplug.cc2
2 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 49ed9e5e..faaa84db 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
2004-01-19 Thomas Vander Stichele <thomas at apestaart dot org>
+ * ext/sidplay/gstsiddec.cc:
+ * gst/modplug/gstmodplug.cc:
+ parenthese NULL because C++ seems angry about it
+
+2004-01-19 Thomas Vander Stichele <thomas at apestaart dot org>
+
* gst-libs/gst/gst-i18n-plugin.h:
add skeleton i18n stuff, but needs to be further implemented
diff --git a/gst/modplug/gstmodplug.cc b/gst/modplug/gstmodplug.cc
index 02699085..035557f4 100644
--- a/gst/modplug/gstmodplug.cc
+++ b/gst/modplug/gstmodplug.cc
@@ -575,7 +575,7 @@ gst_modplug_loop (GstElement *element)
if (!GST_PAD_CAPS (modplug->srcpad) &&
modplug_negotiate (modplug) <= 0) {
- gst_element_error (modplug, CORE, NEGOTIATION, ("test"), ("test"));
+ gst_element_error (modplug, CORE, NEGOTIATION, (NULL), (NULL));
return;
}