Commit 47066a4d authored by astrange's avatar astrange

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.


git-svn-id: file:///var/local/repositories/ffmpeg/trunk@13957 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
parent af92c515
...@@ -531,7 +531,10 @@ int main(int argc, char **argv) ...@@ -531,7 +531,10 @@ int main(int argc, char **argv)
init_fdct(); init_fdct();
idct_mmx_init(); idct_mmx_init();
#ifndef mm_flags
mm_flags = mm_support(); mm_flags = mm_support();
#endif
for(i=0;i<256;i++) cropTbl[i + MAX_NEG_CROP] = i; for(i=0;i<256;i++) cropTbl[i + MAX_NEG_CROP] = i;
for(i=0;i<MAX_NEG_CROP;i++) { for(i=0;i<MAX_NEG_CROP;i++) {
......
...@@ -578,6 +578,11 @@ extern int mm_flags; ...@@ -578,6 +578,11 @@ extern int mm_flags;
#define DECLARE_ALIGNED_8(t, v) DECLARE_ALIGNED(16, t, v) #define DECLARE_ALIGNED_8(t, v) DECLARE_ALIGNED(16, t, v)
#define STRIDE_ALIGN 16 #define STRIDE_ALIGN 16
#else
#define mm_flags 0
#define mm_support() 0
#endif #endif
#ifndef DECLARE_ALIGNED_8 #ifndef DECLARE_ALIGNED_8
......
...@@ -186,7 +186,10 @@ int main(int argc, char **argv) ...@@ -186,7 +186,10 @@ int main(int argc, char **argv)
MDCTContext m1, *m = &m1; MDCTContext m1, *m = &m1;
int fft_nbits, fft_size; int fft_nbits, fft_size;
#ifndef mm_flags
mm_flags = 0; mm_flags = 0;
#endif
fft_nbits = 9; fft_nbits = 9;
for(;;) { for(;;) {
c = getopt(argc, argv, "hsimn:"); c = getopt(argc, argv, "hsimn:");
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment