diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-04-22 03:50:23 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-04-22 03:54:30 +0200 |
| commit | 8772156be0725fd20d948a855616fe155fafdc09 (patch) | |
| tree | 35a59d27786b602b70c98fd1b9c41ab6b47e95cf /tests | |
| parent | 89f903b3d5ec38c9c5d90fba7e626fa0eda61a32 (diff) | |
| parent | b4a53314f115a47567b77004e02dd317e0e29ad9 (diff) | |
Merge remote branch 'qatar/master'
* qatar/master:
APIChanges: document git revision for CODEC_CAP_SLICE_THREADS addition.
Introduce slice threads flag.
FATE: allow forcing thread-type when doing threaded fate runs.
Use av_log_ask_for_sample() where appropriate.
error: sort, pack, and align error code and string definitions
The stabilization period after version bumps should be one month, not one week.
applehttp: Expose the stream bitrate via metadata
doc: Add some initial docs on the applehttp demuxer
Provide a fallback version of the libm function trunc
libavdevice: Define _XOPEN_SOURCE for usleep
lavc: provide deprecated avcodec_thread_init until next major version
lavc: provide the opt.h header until the next bump
error: change AVERROR_EOF value
error: remove AVERROR_NUMEXPECTED
error: add error code AVERROR_OPTION_NOT_FOUND, and use it in opt.c
Conflicts:
libavcodec/h264.c
libavutil/error.c
libavutil/error.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests')
| -rwxr-xr-x | tests/fate-run.sh | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/tests/fate-run.sh b/tests/fate-run.sh index 3a6b46b786..366145d22f 100755 --- a/tests/fate-run.sh +++ b/tests/fate-run.sh @@ -16,6 +16,7 @@ cmp=${6:-diff} ref=${7:-"${base}/ref/fate/${test}"} fuzz=$8 threads=${9:-1} +thread_type=${10:-3} outdir="tests/data/fate" outfile="${outdir}/${test}" @@ -49,7 +50,7 @@ run(){ } ffmpeg(){ - run ffmpeg -v 0 -threads $threads "$@" + run ffmpeg -v 0 -threads $threads -thread_type $thread_type "$@" } framecrc(){ @@ -78,7 +79,7 @@ regtest(){ cleanfiles="$cleanfiles $outfile $errfile" outfile=tests/data/regression/$2/$t errfile=tests/data/$t.$2.err - ${base}/${1}-regression.sh $t $2 $3 "$target_exec" "$target_path" "$threads" + ${base}/${1}-regression.sh $t $2 $3 "$target_exec" "$target_path" "$threads" "$thread_type" } codectest(){ |