diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | ext/wavpack/gstwavpackparse.c | 15 |
2 files changed, 6 insertions, 15 deletions
@@ -1,3 +1,9 @@ +2008-04-04 Sebastian Dröge <slomo@circular-chaos.org> + + * ext/wavpack/gstwavpackparse.c: + (gst_wavpack_parse_index_entry_free): + Always use GSlice as we actually depend on GLib 2.12 already. + 2008-04-04 Tim-Philipp Müller <tim at centricular dot net> * configure.ac: diff --git a/ext/wavpack/gstwavpackparse.c b/ext/wavpack/gstwavpackparse.c index 4fd00b9b..50e31a70 100644 --- a/ext/wavpack/gstwavpackparse.c +++ b/ext/wavpack/gstwavpackparse.c @@ -57,8 +57,6 @@ GST_DEBUG_CATEGORY_STATIC (gst_wavpack_parse_debug); #define GST_CAT_DEFAULT gst_wavpack_parse_debug -/* FIXME: unconditionally use GSlice after we depend on GLib >= 2.10 */ -#if GLIB_CHECK_VERSION (2, 10, 0) static inline GstWavpackParseIndexEntry * gst_wavpack_parse_index_entry_new () { @@ -70,19 +68,6 @@ gst_wavpack_parse_index_entry_free (GstWavpackParseIndexEntry * entry) { g_slice_free (GstWavpackParseIndexEntry, entry); } -#else -static inline GstWavpackParseIndexEntry * -gst_wavpack_parse_index_entry_new () -{ - return g_new (GstWavpackParseIndexEntry, 1); -} - -static inline void -gst_wavpack_parse_index_entry_free (GstWavpackParseIndexEntry * entry) -{ - g_free (entry); -} -#endif static GstStaticPadTemplate sink_factory = GST_STATIC_PAD_TEMPLATE ("sink", GST_PAD_SINK, |