mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-01-02 05:28:48 +00:00
Code Issues 1 Projects Releases Wiki Activity

Depend on GLib 2.12 and use it unconditionally as we do in other modules too already.

Browse source 
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.
This commit is contained in:
Sebastian Dröge 2008-04-04 19:04:20 +00:00
parent e6107e7b39
commit 0815b78811
4 changed files with 10 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
ChangeLog
View file

@ -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> 2008-04-03 Sebastian Dröge <slomo@circular-chaos.org>
* gst/mpegaudioparse/gstmpegaudioparse.c: * gst/mpegaudioparse/gstmpegaudioparse.c:

2
configure.ac
View file

@ -145,7 +145,7 @@ AG_GST_CHECK_FUNCTION
dnl *** checks for dependency libraries *** dnl *** checks for dependency libraries ***
dnl GLib is required dnl GLib is required
AG_GST_GLIB_CHECK([2.6]) AG_GST_GLIB_CHECK([2.12])
dnl liboil is required dnl liboil is required
PKG_CHECK_MODULES(LIBOIL, liboil-0.3 >= 0.3.8, HAVE_LIBOIL=yes, HAVE_LIBOIL=no) PKG_CHECK_MODULES(LIBOIL, liboil-0.3 >= 0.3.8, HAVE_LIBOIL=yes, HAVE_LIBOIL=no)

15
gst/mpegaudioparse/gstmpegaudioparse.c
View file

@ -41,8 +41,6 @@ GST_DEBUG_CATEGORY_STATIC (mp3parse_debug);
#define GST_READ_UINT24_BE(p) (p[2] | (p[1] << 8) | (p[0] << 16)) #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 * static inline MPEGAudioSeekEntry *
mpeg_audio_seek_entry_new () mpeg_audio_seek_entry_new ()
{ {
@ -54,19 +52,6 @@ mpeg_audio_seek_entry_free (MPEGAudioSeekEntry * entry)
{ {
g_slice_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 */ /* elementfactory information */
static GstElementDetails mp3parse_details = { static GstElementDetails mp3parse_details = {

15
gst/mpegaudioparse/gstxingmux.c
View file

@ -69,8 +69,6 @@ typedef struct _GstXingSeekEntry
gint byte; gint byte;
} GstXingSeekEntry; } GstXingSeekEntry;
/* FIXME: unconditionally use GSlice after we depend on GLib >= 2.10 */
#if GLIB_CHECK_VERSION (2, 10, 0)
static inline GstXingSeekEntry * static inline GstXingSeekEntry *
gst_xing_seek_entry_new () gst_xing_seek_entry_new ()
{ {
@ -82,19 +80,6 @@ gst_xing_seek_entry_free (GstXingSeekEntry * entry)
{ {
g_slice_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 void gst_xing_mux_finalize (GObject * obj);
static GstStateChangeReturn static GstStateChangeReturn