summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
m---------common0
-rw-r--r--gst-libs/gst/resample/private.h13
3 files changed, 14 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index adec768b..2def2b15 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-05-24 Benjamin Otte <in7y118@public.uni-hamburg.de>
+
+ * gst-libs/gst/resample/private.h:
+ don't use optimizations that are #if 0'ed
+
2004-05-24 Wim Taymans <wim@fluendo.com>
* gst/avi/gstavidemux.c: (gst_avi_demux_handle_src_query):
diff --git a/common b/common
-Subproject 85747ad7d18dfc697845a457631f3877fda4690
+Subproject 6e6d3f154c84195e9d505e114ea4a2df216f727
diff --git a/gst-libs/gst/resample/private.h b/gst-libs/gst/resample/private.h
index 5791f580..c2eb86ad 100644
--- a/gst-libs/gst/resample/private.h
+++ b/gst-libs/gst/resample/private.h
@@ -88,11 +88,16 @@ void conv_short_double_ppcasm(short *dest, double *src, int n);
#endif
#ifdef HAVE_CPU_PPC
-#define conv_double_short conv_double_short_table
-#define conv_short_double conv_short_double_ppcasm
+# define conv_double_short conv_double_short_table
+# if 0
+/* disabled as in .c */
+# define conv_short_double conv_short_double_ppcasm
+# else
+# define conv_short_double conv_short_double_ref
+# endif
#else
-#define conv_double_short conv_double_short_ref
-#define conv_short_double conv_short_double_ref
+# define conv_double_short conv_double_short_ref
+# define conv_short_double conv_short_double_ref
#endif
#define conv_double_float conv_double_float_ref