summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorJames Almer <jamrial@gmail.com>2019-03-19 01:04:49 -0300
committerJames Almer <jamrial@gmail.com>2019-03-19 01:08:16 -0300
commitf8075b2c91c39097322c44e24847c5a20e73a943 (patch)
tree159e59ee6294caf6e7d82e9621901f51e803f624 /tests
parent4ed6a485d324b5d0fdd1740d1b2d500ff186dc90 (diff)
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')
-rwxr-xr-xtests/fate-run.sh7
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 $*