From 0984f9405a991ee8b0f1e6258dc59d2d821eb9ca Mon Sep 17 00:00:00 2001 From: Tim-Philipp Müller Date: Sat, 23 Feb 2008 11:53:27 +0000 Subject: gst/goom/: Compile fixes for x86-64. Original commit message from CVS: * gst/goom/goomsl_heap.c: (align_it): * gst/goom/plugin_info.c: (setOptimizedMethods): Compile fixes for x86-64. --- gst/goom/goomsl_heap.c | 4 ++-- gst/goom/plugin_info.c | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) (limited to 'gst/goom') diff --git a/gst/goom/goomsl_heap.c b/gst/goom/goomsl_heap.c index 4cbab5cc..e418a2af 100644 --- a/gst/goom/goomsl_heap.c +++ b/gst/goom/goomsl_heap.c @@ -46,8 +46,8 @@ align_it (GoomHeap * _this, int alignment) { if ((alignment > 1) && (_this->number_of_arrays > 0)) { void *last_array = _this->arrays[_this->number_of_arrays - 1]; - int last_address = (int) last_array + _this->consumed_in_last_array; - int decal = (last_address % alignment); + long last_address = (long) last_array + _this->consumed_in_last_array; + long decal = (last_address % alignment); if (decal != 0) { _this->consumed_in_last_array += alignment - decal; diff --git a/gst/goom/plugin_info.c b/gst/goom/plugin_info.c index 465c2908..f5d04bab 100644 --- a/gst/goom/plugin_info.c +++ b/gst/goom/plugin_info.c @@ -36,11 +36,12 @@ setOptimizedMethods (PluginInfo * p) p->methods.zoom_filter = zoom_filter_c; /* p->methods.create_output_with_brightness = create_output_with_brightness;*/ +/* FIXME: what about HAVE_CPU_X86_64 ? */ #ifdef HAVE_CPU_I386 printf ("have an x86\n"); if (cpuFlavour & OIL_IMPL_FLAG_MMXEXT) { #ifdef VERBOSE - printf ("Extented MMX detected. Using the fastest methods !\n"); + printf ("Extended MMX detected. Using the fastest methods !\n"); #endif p->methods.draw_line = draw_line_mmx; p->methods.zoom_filter = zoom_filter_xmmx; @@ -74,6 +75,7 @@ setOptimizedMethods (PluginInfo * p) } #endif /* HAVE_CPU_PPC */ + cpuFlavour = 0; /* trick compiler into thinking variable is used */ } void -- cgit