[FFmpeg-cvslog] tests/fate-run: fix regression in encoding options

James Almer git at videolan.org
Tue Mar 19 06:10:25 EET 2019


ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Tue Mar 19 01:04:49 2019 -0300| [f8075b2c91c39097322c44e24847c5a20e73a943] | committer: James Almer

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 at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f8075b2c91c39097322c44e24847c5a20e73a943
---

 tests/fate-run.sh | 7 ++++---
 1 file 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 $*



More information about the ffmpeg-cvslog mailing list