From fc8cb3988fc239b254e093801e429b206cb43c62 Mon Sep 17 00:00:00 2001 From: Måns Rullgård Date: Mon, 8 Mar 2010 00:26:58 +0000 Subject: regtest: move md5sum wrappers into separate file ffserver-regression.sh doesn't need anything else from regression-funcs.sh, and sourcing the entire file there breaks things. Originally committed as revision 22304 to svn://svn.ffmpeg.org/ffmpeg/trunk --- tests/regression-funcs.sh | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) (limited to 'tests/regression-funcs.sh') diff --git a/tests/regression-funcs.sh b/tests/regression-funcs.sh index 7aa57e0f7e..8fd17abd06 100755 --- a/tests/regression-funcs.sh +++ b/tests/regression-funcs.sh @@ -39,15 +39,7 @@ mkdir -p "$outfile" [ "${V-0}" -gt 0 ] && echov=echo || echov=: [ "${V-0}" -gt 1 ] || exec 2>$errfile -if [ X"$(echo | md5sum 2> /dev/null)" != X ]; then - do_md5sum() { md5sum -b $1; } -elif [ X"$(echo | md5 2> /dev/null)" != X ]; then - do_md5sum() { md5 $1 | sed 's#MD5 (\(.*\)) = \(.*\)#\2 *\1#'; } -elif [ -x /sbin/md5 ]; then - do_md5sum() { /sbin/md5 -r $1 | sed 's# \**\./# *./#'; } -else - do_md5sum() { echo No md5sum program found; } -fi +. $(dirname $0)/md5.sh FFMPEG_OPTS="-v 0 -y -flags +bitexact -dct fastint -idct simple -sws_flags +accurate_rnd+bitexact" -- cgit v1.2.3