diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-01-22 13:59:13 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-01-22 14:09:59 +0100 |
| commit | eb2f499e37ee8c890836f80c3ffba57e971fe514 (patch) | |
| tree | 1feebb950c73a6f710459f998795525e9b9828fb /tests/fate-run.sh | |
| parent | 766f0552012480934b65a1935d272f6c8cf756fe (diff) | |
| parent | 9146e872c643fb8f20f9043f1b93a3cddfad15c6 (diff) | |
| download | ffmpeg-eb2f499e37ee8c890836f80c3ffba57e971fe514.tar.gz | |
Merge commit '9146e872c643fb8f20f9043f1b93a3cddfad15c6'
* commit '9146e872c643fb8f20f9043f1b93a3cddfad15c6':
Revert "fate: Use wmv2 IDCT for wmv2 tests"
Conflicts:
tests/fate-run.sh
tests/fate/vcodec.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests/fate-run.sh')
| -rwxr-xr-x | tests/fate-run.sh | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/tests/fate-run.sh b/tests/fate-run.sh index 95bc9703ca..0520d62f7d 100755 --- a/tests/fate-run.sh +++ b/tests/fate-run.sh @@ -128,7 +128,6 @@ enc_dec(){ enc_opt=$4 dec_fmt=$5 dec_opt=$6 - ddc_opt=$8 encfile="${outdir}/${test}.${enc_fmt}" decfile="${outdir}/${test}.out.${dec_fmt}" cleanfiles="$cleanfiles $decfile" @@ -140,7 +139,7 @@ enc_dec(){ -f $enc_fmt -y $tencfile || return do_md5sum $encfile echo $(wc -c $encfile) - ffmpeg $DEC_OPTS $ddc_opt -i $tencfile $ENC_OPTS $dec_opt $FLAGS \ + ffmpeg $8 $DEC_OPTS -i $tencfile $ENC_OPTS $dec_opt $FLAGS \ -f $dec_fmt -y $tdecfile || return do_md5sum $decfile tests/tiny_psnr $srcfile $decfile $cmp_unit $cmp_shift |