mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2025-06-07 16:08:51 +00:00
Small cleanups
Original commit message from CVS: Small cleanups
This commit is contained in:
parent
ca2bc32210
commit
44896269e5
3 changed files with 34 additions and 32 deletions
15
gst/gstcpu.c
15
gst/gstcpu.c
|
@ -23,26 +23,27 @@
|
||||||
#include <glib.h>
|
#include <glib.h>
|
||||||
|
|
||||||
#include "gst_private.h"
|
#include "gst_private.h"
|
||||||
|
|
||||||
#include "gstcpu.h"
|
#include "gstcpu.h"
|
||||||
|
|
||||||
|
|
||||||
static guint32 _gst_cpu_flags;
|
static guint32 _gst_cpu_flags;
|
||||||
|
|
||||||
#ifdef HAVE_CPU_I386
|
#ifdef HAVE_CPU_I386
|
||||||
void gst_cpuid_i386(int,long *,long *,long *,long *);
|
void gst_cpuid_i386 (int, unsigned long *, unsigned long *, unsigned long *, unsigned long *);
|
||||||
#define gst_cpuid gst_cpuid_i386
|
#define gst_cpuid gst_cpuid_i386
|
||||||
|
|
||||||
#else
|
#else
|
||||||
#define gst_cpuid(o,a,b,c,d) (void)(a);(void)(b);(void)(c);
|
#define gst_cpuid(o,a,b,c,d) (void)(a);(void)(b);(void)(c);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
static gchar *stringcat (gchar *a,gchar *b) {
|
static gchar *
|
||||||
|
stringcat (gchar * a, gchar * b)
|
||||||
|
{
|
||||||
gchar *c;
|
gchar *c;
|
||||||
|
|
||||||
if (a) {
|
if (a) {
|
||||||
c = g_strconcat (a, b, NULL);
|
c = g_strconcat (a, b, NULL);
|
||||||
g_free (a);
|
g_free (a);
|
||||||
} else {
|
}
|
||||||
|
else {
|
||||||
c = g_strdup (b);
|
c = g_strdup (b);
|
||||||
}
|
}
|
||||||
return c;
|
return c;
|
||||||
|
@ -55,7 +56,7 @@ _gst_cpu_initialize (void)
|
||||||
gchar *featurelist = NULL;
|
gchar *featurelist = NULL;
|
||||||
gboolean AMD;
|
gboolean AMD;
|
||||||
|
|
||||||
long eax=0, ebx=0, ecx=0, edx=0;
|
gulong eax = 0, ebx = 0, ecx = 0, edx = 0;
|
||||||
|
|
||||||
gst_cpuid (0, &eax, &ebx, &ecx, &edx);
|
gst_cpuid (0, &eax, &ebx, &ecx, &edx);
|
||||||
|
|
||||||
|
|
|
@ -45,6 +45,7 @@ gst_timecache_get_type(void) {
|
||||||
sizeof(GstTimeCache),
|
sizeof(GstTimeCache),
|
||||||
1,
|
1,
|
||||||
(GInstanceInitFunc)gst_timecache_init,
|
(GInstanceInitFunc)gst_timecache_init,
|
||||||
|
NULL
|
||||||
};
|
};
|
||||||
tc_type = g_type_register_static(GST_TYPE_OBJECT, "GstTimeCache", &tc_info, 0);
|
tc_type = g_type_register_static(GST_TYPE_OBJECT, "GstTimeCache", &tc_info, 0);
|
||||||
}
|
}
|
||||||
|
|
|
@ -86,7 +86,7 @@ struct _GstTimeCache {
|
||||||
};
|
};
|
||||||
|
|
||||||
GType gst_timecache_get_type (void);
|
GType gst_timecache_get_type (void);
|
||||||
GstTimeCache* gst_timecache_new ();
|
GstTimeCache* gst_timecache_new (void);
|
||||||
|
|
||||||
gint gst_timecache_get_group (GstTimeCache *tc);
|
gint gst_timecache_get_group (GstTimeCache *tc);
|
||||||
gint gst_timecache_new_group (GstTimeCache *tc);
|
gint gst_timecache_new_group (GstTimeCache *tc);
|
||||||
|
|
Loading…
Reference in a new issue