aboutsummaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2011-10-10 03:41:49 +0200
committerMichael Niedermayer <michaelni@gmx.at>2011-10-10 03:50:58 +0200
commit0a23067ab41326dfa1da41d18923ea8547a51ff5 (patch)
treec3a964ea639441d00fafffcba296b5ae79a0bd2c /tests
parent028a79c1f142f9903c238846cc565edcef2d3802 (diff)
parent581810f5024dbb9df8e794dc0f5beac30d3a5fd4 (diff)
downloadffmpeg-0a23067ab41326dfa1da41d18923ea8547a51ff5.tar.gz
Merge remote-tracking branch 'qatar/master'
* qatar/master: mpeg4dec: use unsigned type for startcode in ff_mpeg4_decode_picture_header mpeg124: use sign_extend() function ac3dec: use get_sbits() instead of manually sign-extending 4xm: fix signed overflow wmavoice: fix a signed overflow mpegvideo_enc: fix a signed overflow crc: fix signed overflow fate: run avconv with -nostats flag avtools: add -v as alias for -loglevel avconv: always print stats with AV_LOG_INFO doc/avconv: add forgotten output/per-stream info to -filter avconv: add -stats option to enable/disable printing encoding progress avconv: in output_packet() don't set decoded_data_size for video. avconv: remove pointless always true condition avconv: factorize common code in transcode_init() zmbv: remove memcpy() of decoded frame mpeg12enc: use sign_extend() function h264pred: use unsigned types for pixel values, fix signed overflows h264: fix signed overflows in x*0x01010101 expressions h264pred: remove unused variables Conflicts: avconv.c tests/fate-run.sh Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests')
-rwxr-xr-xtests/fate-run.sh2
-rwxr-xr-xtests/regression-funcs.sh2
2 files changed, 2 insertions, 2 deletions
diff --git a/tests/fate-run.sh b/tests/fate-run.sh
index a2aa7cbb9e..350ff573c7 100755
--- a/tests/fate-run.sh
+++ b/tests/fate-run.sh
@@ -51,7 +51,7 @@ run(){
}
avconv(){
- run $tool -v 0 -threads $threads -thread_type $thread_type "$@"
+ run $tool -nostats -threads $threads -thread_type $thread_type "$@"
}
framecrc(){
diff --git a/tests/regression-funcs.sh b/tests/regression-funcs.sh
index 14d4e29bf9..b8164843a5 100755
--- a/tests/regression-funcs.sh
+++ b/tests/regression-funcs.sh
@@ -44,7 +44,7 @@ echov(){
. $(dirname $0)/md5.sh
-AVCONV_OPTS="-v 0 -y"
+AVCONV_OPTS="-nostats -y"
COMMON_OPTS="-flags +bitexact -idct simple -sws_flags +accurate_rnd+bitexact"
DEC_OPTS="$COMMON_OPTS -threads $threads"
ENC_OPTS="$COMMON_OPTS -threads 1 -dct fastint"