diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-04-26 22:24:58 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-04-26 22:24:58 +0200 |
| commit | e890b689628634d75e093b24ae257b008fc85443 (patch) | |
| tree | af2189297e3da55438dc0e968633a8a2806fb5fd /libavcodec/fft-test.c | |
| parent | f1f5b39866c4deb7800aa9288010cdbd386da477 (diff) | |
| parent | 0a07f2b346433a9a2677c69c6b29a1a827e39109 (diff) | |
| download | ffmpeg-e890b689628634d75e093b24ae257b008fc85443.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
dsputil: fix invalid array indexing
configure: add libavresample to rpath
build: icc: silence some warnings
fft-test: add option to set cpuflag mask
cpu: recognise only cpu flag names pertinent to the architecture
avutil: add av_parse_cpu_flags() function
vp8: armv6: fix non-armv6t2 build
vp8: armv6 optimisations
vp8: arm: separate ARMv6 functions from NEON
ARM: add some compatibility macros
mov: support eac3 audio
avf: fix faulty check in has_duration
Conflicts:
configure
doc/APIchanges
ffmpeg.c
libavcodec/arm/Makefile
libavcodec/arm/asm.S
libavcodec/arm/vp8dsp_armv6.S
libavcodec/arm/vp8dsp_init_arm.c
libavutil/avutil.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/fft-test.c')
| -rw-r--r-- | libavcodec/fft-test.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/libavcodec/fft-test.c b/libavcodec/fft-test.c index 6b3880cf5d..d2bd0cfecb 100644 --- a/libavcodec/fft-test.c +++ b/libavcodec/fft-test.c @@ -23,6 +23,7 @@ * FFT and MDCT tests. */ +#include "libavutil/cpu.h" #include "libavutil/mathematics.h" #include "libavutil/lfg.h" #include "libavutil/log.h" @@ -240,6 +241,7 @@ int main(int argc, char **argv) FFTComplex *tab, *tab1, *tab_ref; FFTSample *tab2; int it, i, c; + int cpuflags; int do_speed = 0; int err = 1; enum tf_transform transform = TRANSFORM_FFT; @@ -258,7 +260,7 @@ int main(int argc, char **argv) fft_nbits = 9; for(;;) { - c = getopt(argc, argv, "hsimrdn:f:"); + c = getopt(argc, argv, "hsimrdn:f:c:"); if (c == -1) break; switch(c) { @@ -286,6 +288,12 @@ int main(int argc, char **argv) case 'f': scale = atof(optarg); break; + case 'c': + cpuflags = av_parse_cpu_flags(optarg); + if (cpuflags < 0) + return 1; + av_set_cpu_flags_mask(cpuflags); + break; } } |