diff options
| author | Sebastian Dröge <slomo@circular-chaos.org> | 2008-04-04 19:04:20 +0000 |
|---|---|---|
| committer | Sebastian Dröge <slomo@circular-chaos.org> | 2008-04-04 19:04:20 +0000 |
| commit | 0815b7881155c844b545493369a30df6d4d91963 (patch) | |
| tree | 7231a0ca2b0aea8abbd87a6e70eb6dda54ffa3da | |
| parent | e6107e7b39b3b9d6a1d761b712b445067aab1376 (diff) | |
| download | gstreamer-plugins-ugly-0815b7881155c844b545493369a30df6d4d91963.tar.gz | |
Depend on GLib 2.12 and use it unconditionally as we do in other modules too already.
Original commit message from CVS:
* configure.ac:
* gst/mpegaudioparse/gstmpegaudioparse.c:
(mpeg_audio_seek_entry_free):
* gst/mpegaudioparse/gstxingmux.c: (gst_xing_seek_entry_free):
Depend on GLib 2.12 and use it unconditionally as we do in other
modules too already.
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | gst/mpegaudioparse/gstmpegaudioparse.c | 15 | ||||
| -rw-r--r-- | gst/mpegaudioparse/gstxingmux.c | 15 |
4 files changed, 10 insertions, 31 deletions
@@ -1,3 +1,12 @@ +2008-04-04 Sebastian Dröge <slomo@circular-chaos.org> + + * configure.ac: + * gst/mpegaudioparse/gstmpegaudioparse.c: + (mpeg_audio_seek_entry_free): + * gst/mpegaudioparse/gstxingmux.c: (gst_xing_seek_entry_free): + Depend on GLib 2.12 and use it unconditionally as we do in other + modules too already. + 2008-04-03 Sebastian Dröge <slomo@circular-chaos.org> * gst/mpegaudioparse/gstmpegaudioparse.c: diff --git a/configure.ac b/configure.ac index f00a9a8e..6277a650 100644 --- a/configure.ac +++ b/configure.ac @@ -145,7 +145,7 @@ AG_GST_CHECK_FUNCTION dnl *** checks for dependency libraries *** dnl GLib is required -AG_GST_GLIB_CHECK([2.6]) +AG_GST_GLIB_CHECK([2.12]) dnl liboil is required PKG_CHECK_MODULES(LIBOIL, liboil-0.3 >= 0.3.8, HAVE_LIBOIL=yes, HAVE_LIBOIL=no) diff --git a/gst/mpegaudioparse/gstmpegaudioparse.c b/gst/mpegaudioparse/gstmpegaudioparse.c index 50f0c2f0..544efd90 100644 --- a/gst/mpegaudioparse/gstmpegaudioparse.c +++ b/gst/mpegaudioparse/gstmpegaudioparse.c @@ -41,8 +41,6 @@ GST_DEBUG_CATEGORY_STATIC (mp3parse_debug); #define GST_READ_UINT24_BE(p) (p[2] | (p[1] << 8) | (p[0] << 16)) -/* FIXME: unconditionally use GSlice after we depend on GLib >= 2.10 */ -#if GLIB_CHECK_VERSION (2, 10, 0) static inline MPEGAudioSeekEntry * mpeg_audio_seek_entry_new () { @@ -54,19 +52,6 @@ mpeg_audio_seek_entry_free (MPEGAudioSeekEntry * entry) { g_slice_free (MPEGAudioSeekEntry, entry); } -#else -static inline MPEGAudioSeekEntry * -mpeg_audio_seek_entry_new () -{ - return g_new (MPEGAudioSeekEntry, 1); -} - -static inline void -mpeg_audio_seek_entry_free (MPEGAudioSeekEntry * entry) -{ - g_free (entry); -} -#endif /* elementfactory information */ static GstElementDetails mp3parse_details = { diff --git a/gst/mpegaudioparse/gstxingmux.c b/gst/mpegaudioparse/gstxingmux.c index 1089bcda..49454f08 100644 --- a/gst/mpegaudioparse/gstxingmux.c +++ b/gst/mpegaudioparse/gstxingmux.c @@ -69,8 +69,6 @@ typedef struct _GstXingSeekEntry gint byte; } GstXingSeekEntry; -/* FIXME: unconditionally use GSlice after we depend on GLib >= 2.10 */ -#if GLIB_CHECK_VERSION (2, 10, 0) static inline GstXingSeekEntry * gst_xing_seek_entry_new () { @@ -82,19 +80,6 @@ gst_xing_seek_entry_free (GstXingSeekEntry * entry) { g_slice_free (GstXingSeekEntry, entry); } -#else -static inline GstXingSeekEntry * -gst_xing_seek_entry_new () -{ - return g_new (GstXingSeekEntry, 1); -} - -static inline void -gst_xing_seek_entry_free (GstXingSeekEntry * entry) -{ - g_free (entry); -} -#endif static void gst_xing_mux_finalize (GObject * obj); static GstStateChangeReturn |