diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-03-07 02:57:53 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-03-07 03:22:49 +0100 |
| commit | 6df42f98746be06c883ce683563e07c9a2af983f (patch) | |
| tree | 6bb893aaf179526515cfb3b1cc933721317dcf6f /tests/fate-run.sh | |
| parent | 57986c501e8c97d4bd2e1b7ce9e9037c4ae06245 (diff) | |
| parent | b5161908e06b4497bf663510fb495ba97a6fd2b5 (diff) | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
SBR DSP: fix SSE code to not use SSE2 instructions.
cpu: initialize mask to -1, so that by default, optimizations are used.
error_resilience: initialize s->block_index[].
svq3: protect against negative quantizers.
Don't use ff_cropTbl[] for IDCT.
swscale: make filterPos 32bit.
FATE: add CPUFLAGS variable, mapping to -cpuflags avconv option.
avconv: add -cpuflags option for setting supported cpuflags.
cpu: add av_set_cpu_flags_mask().
libx264: Allow overriding the sliced threads option
avconv: fix counting encoded video size.
Conflicts:
doc/APIchanges
doc/fate.texi
doc/ffmpeg.texi
ffmpeg.c
libavcodec/h264idct_template.c
libavcodec/svq3.c
libavutil/avutil.h
libavutil/cpu.c
libavutil/cpu.h
libswscale/swscale.c
tests/Makefile
tests/fate-run.sh
tests/regression-funcs.sh
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests/fate-run.sh')
| -rwxr-xr-x | tests/fate-run.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/fate-run.sh b/tests/fate-run.sh index d7b5e7e83b..f7a51ad2b8 100755 --- a/tests/fate-run.sh +++ b/tests/fate-run.sh @@ -17,7 +17,7 @@ ref=${7:-"${base}/ref/fate/${test}"} fuzz=$8 threads=${9:-1} thread_type=${10:-frame+slice} -tool=${11} +cpuflags=${11:-all} outdir="tests/data/fate" outfile="${outdir}/${test}" @@ -51,7 +51,7 @@ run(){ } avconv(){ - run $tool -nostats -threads $threads -thread_type $thread_type "$@" + run ffmpeg -nostats -threads $threads -thread_type $thread_type -cpuflags $cpuflags "$@" } framecrc(){ @@ -77,7 +77,7 @@ pcm(){ regtest(){ t="${test#$2-}" ref=${base}/ref/$2/$t - ${base}/${1}-regression.sh $t $2 $3 "$target_exec" "$target_path" "$threads" "$thread_type" "$tool" "$samples" + ${base}/${1}-regression.sh $t $2 $3 "$target_exec" "$target_path" "$threads" "$thread_type" "$cpuflags" "$samples" } codectest(){ |