From f67a10cd0c7fd9589e7fadfb8daeec8faba4cd39 Mon Sep 17 00:00:00 2001
From: Alexander Strange <astrange@ithinksw.com>
Date: Tue, 24 Jun 2008 23:51:17 +0000
Subject: Define mm_flags/support to be 0 on architectures where they don't
 exist. Make sure we don't try to set them if that's the case. This lets
 dct-test and fft-test build with --disable-mmx on x86, but not yet on ARM.

Originally committed as revision 13957 to svn://svn.ffmpeg.org/ffmpeg/trunk
---
 libavcodec/dct-test.c | 3 +++
 libavcodec/dsputil.h  | 5 +++++
 libavcodec/fft-test.c | 3 +++
 3 files changed, 11 insertions(+)

(limited to 'libavcodec')

diff --git a/libavcodec/dct-test.c b/libavcodec/dct-test.c
index 5699d89813..e96c895c21 100644
--- a/libavcodec/dct-test.c
+++ b/libavcodec/dct-test.c
@@ -531,7 +531,10 @@ int main(int argc, char **argv)
 
     init_fdct();
     idct_mmx_init();
+
+#ifndef mm_flags
     mm_flags = mm_support();
+#endif
 
     for(i=0;i<256;i++) cropTbl[i + MAX_NEG_CROP] = i;
     for(i=0;i<MAX_NEG_CROP;i++) {
diff --git a/libavcodec/dsputil.h b/libavcodec/dsputil.h
index 0316a451b3..3b7b8791b8 100644
--- a/libavcodec/dsputil.h
+++ b/libavcodec/dsputil.h
@@ -578,6 +578,11 @@ extern int mm_flags;
 #define DECLARE_ALIGNED_8(t, v) DECLARE_ALIGNED(16, t, v)
 #define STRIDE_ALIGN 16
 
+#else
+
+#define mm_flags 0
+#define mm_support() 0
+
 #endif
 
 #ifndef DECLARE_ALIGNED_8
diff --git a/libavcodec/fft-test.c b/libavcodec/fft-test.c
index 88aab487ae..55225fb1f2 100644
--- a/libavcodec/fft-test.c
+++ b/libavcodec/fft-test.c
@@ -186,7 +186,10 @@ int main(int argc, char **argv)
     MDCTContext m1, *m = &m1;
     int fft_nbits, fft_size;
 
+#ifndef mm_flags
     mm_flags = 0;
+#endif
+
     fft_nbits = 9;
     for(;;) {
         c = getopt(argc, argv, "hsimn:");
-- 
cgit v1.2.3