summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--gst-libs/gst/audio/mixerutils.h4
2 files changed, 10 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 42e5caa34..e54ca37ed 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
2007-01-12 Tim-Philipp Müller <tim at centricular dot net>
+ * gst-libs/gst/audio/mixerutils.h:
+ Add G_BEGIN_DECLS and G_END_DECLS guards so these helpers can be
+ used when compiling with c++ compilers as well.
+
+2007-01-12 Tim-Philipp Müller <tim at centricular dot net>
+
* gst/typefind/gsttypefindfunctions.c:
Fix comment.
diff --git a/gst-libs/gst/audio/mixerutils.h b/gst-libs/gst/audio/mixerutils.h
index 204a5a901..cfda7ab7c 100644
--- a/gst-libs/gst/audio/mixerutils.h
+++ b/gst-libs/gst/audio/mixerutils.h
@@ -23,6 +23,8 @@
#include <gst/gst.h>
#include <gst/interfaces/mixer.h>
+G_BEGIN_DECLS
+
/**
* GstAudioMixerFilterFunc:
* @mixer: a #GstElement implementing the #GstMixer interface
@@ -43,4 +45,6 @@ GList * gst_audio_default_registry_mixer_filter (GstAudioMixerFilterFunc filter
gboolean first,
gpointer user_data);
+G_END_DECLS
+
#endif /* __GST_AUDIO_MIXERUTILS_H__ */