diff options
| author | James Almer <jamrial@gmail.com> | 2019-03-19 01:04:49 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2019-03-19 01:08:16 -0300 |
| commit | f8075b2c91c39097322c44e24847c5a20e73a943 (patch) | |
| tree | 159e59ee6294caf6e7d82e9621901f51e803f624 /tests/fate-run.sh | |
| parent | 4ed6a485d324b5d0fdd1740d1b2d500ff186dc90 (diff) | |
| download | ffmpeg-f8075b2c91c39097322c44e24847c5a20e73a943.tar.gz | |
tests/fate-run: fix regression in encoding options
Set threads back to 1. Fixes fate when run in multi threaded mode.
Regression since d0c43e32427ec1efac364be0987a6aafa695527f.
Signed-off-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'tests/fate-run.sh')
| -rwxr-xr-x | tests/fate-run.sh | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/tests/fate-run.sh b/tests/fate-run.sh index 5c2732b912..66cd7914ba 100755 --- a/tests/fate-run.sh +++ b/tests/fate-run.sh @@ -257,9 +257,10 @@ echov(){ echo "$@" >&3 } -AVCONV_OPTS="-nostdin -nostats -y -cpuflags $cpuflags -threads $threads" -DEC_OPTS="-flags +bitexact -idct simple -sws_flags +accurate_rnd+bitexact -fflags +bitexact" -ENC_OPTS="$DEC_OPTS -threads $threads -dct fastint" +AVCONV_OPTS="-nostdin -nostats -y -cpuflags $cpuflags" +COMMON_OPTS="-flags +bitexact -idct simple -sws_flags +accurate_rnd+bitexact -fflags +bitexact" +DEC_OPTS="$COMMON_OPTS -threads $threads" +ENC_OPTS="$COMMON_OPTS -threads 1 -dct fastint" run_avconv(){ $echov $ffmpeg2 $AVCONV_OPTS $* |