From: <sl...@ke...> - 2008-04-04 19:00:26
|
CVS Root: /cvs/gstreamer Module: gst-plugins-good Changes by: slomo Date: Fri Apr 04 2008 19:00:33 UTC Log message: * ext/wavpack/gstwavpackparse.c: (gst_wavpack_parse_index_entry_free): Always use GSlice as we actually depend on GLib 2.12 already. Modified files: . : ChangeLog ext/wavpack : gstwavpackparse.c Links: http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-good/ChangeLog.diff?r1=1.3384&r2=1.3385 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-good/ext/wavpack/gstwavpackparse.c.diff?r1=1.37&r2=1.38 ====Begin Diffs==== Index: ChangeLog =================================================================== RCS file: /cvs/gstreamer/gst-plugins-good/ChangeLog,v retrieving revision 1.3384 retrieving revision 1.3385 diff -u -d -r1.3384 -r1.3385 --- ChangeLog 4 Apr 2008 11:26:38 -0000 1.3384 +++ ChangeLog 4 Apr 2008 19:00:17 -0000 1.3385 @@ -1,3 +1,9 @@ +2008-04-04 Sebastian Dröge <sl...@ci...> + + * 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: Index: gstwavpackparse.c RCS file: /cvs/gstreamer/gst-plugins-good/ext/wavpack/gstwavpackparse.c,v retrieving revision 1.37 retrieving revision 1.38 diff -u -d -r1.37 -r1.38 --- gstwavpackparse.c 3 Apr 2008 18:28:28 -0000 1.37 +++ gstwavpackparse.c 4 Apr 2008 19:00:19 -0000 1.38 @@ -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 @@ 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, |