mirror of https://git.ffmpeg.org/ffmpeg.git
* Removed ffmpeg output during encoding runs. Now only print out errors
* Try to fix mysterious sort order issue in ffserver tests Originally committed as revision 1775 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
parent
129dfab2c7
commit
e31c1c30d2
|
@ -60,7 +60,9 @@ do_ffmpeg()
|
|||
f="$1"
|
||||
shift
|
||||
echo $ffmpeg -bitexact -dct_algo 1 -idct_algo 2 $*
|
||||
$ffmpeg -bitexact -dct_algo 1 -idct_algo 2 -benchmark $* > $datadir/bench.tmp
|
||||
$ffmpeg -bitexact -dct_algo 1 -idct_algo 2 -benchmark $* > $datadir/bench.tmp 2> /tmp/ffmpeg$$
|
||||
grep -v -e ^Stream -e ^Press -e ^Input -e ^Output -e ^frame -e '^ Stream' /tmp/ffmpeg$$ || true
|
||||
rm -f /tmp/ffmpeg$$
|
||||
md5sum -b $f >> $logfile
|
||||
if [ $f = $raw_dst ] ; then
|
||||
$tiny_psnr $f $raw_ref >> $logfile
|
||||
|
|
|
@ -7,7 +7,7 @@ cp test.conf data/test.conf
|
|||
perl -e 'chomp($wd = `pwd`); print map { s!data/!!; "<Stream $_>\nFile $wd/data/$_\n</Stream>\n\n" } @ARGV' data/a* >> data/test.conf
|
||||
perl -e 'chomp($wd = `pwd`); print map { s!data/!!; "<Stream $_.asf>\nFile $wd/data/$_\n</Stream>\n\n" } @ARGV' data/a* >> data/test.conf
|
||||
|
||||
FILES=`perl -n -e 'print \$1, " " if /<stream\\s+(\\S+)>/i' data/test.conf`
|
||||
FILES=`perl -n -e 'print \$1, " " if /<stream\\s+(\\S+)>/i' data/test.conf | sort`
|
||||
|
||||
rm -f /tmp/feed.ffm
|
||||
../ffserver -d -f data/test.conf 2> /dev/null &
|
||||
|
|
Loading…
Reference in New Issue