diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-01-21 16:28:04 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-01-21 16:28:04 +0100 |
| commit | cf4515ecd985aab899f24a6b7d18432001e670fa (patch) | |
| tree | 044e03a1909155a1f27871371b0043c2baa758ed /tests/fate-run.sh | |
| parent | 6ea8a830e8f1eee465174c479840b18b4963d43d (diff) | |
| parent | ce378f0dd0c4e5350b3280e6b3e8d6b46fe4b0a3 (diff) | |
| download | ffmpeg-cf4515ecd985aab899f24a6b7d18432001e670fa.tar.gz | |
Merge commit 'ce378f0dd0c4e5350b3280e6b3e8d6b46fe4b0a3'
* commit 'ce378f0dd0c4e5350b3280e6b3e8d6b46fe4b0a3':
fate: Use wmv2 IDCT for wmv2 tests
vorbisdsp: change block_size type from int to intptr_t.
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, 2 insertions, 1 deletions
diff --git a/tests/fate-run.sh b/tests/fate-run.sh index 0520d62f7d..95bc9703ca 100755 --- a/tests/fate-run.sh +++ b/tests/fate-run.sh @@ -128,6 +128,7 @@ 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" @@ -139,7 +140,7 @@ enc_dec(){ -f $enc_fmt -y $tencfile || return do_md5sum $encfile echo $(wc -c $encfile) - ffmpeg $8 $DEC_OPTS -i $tencfile $ENC_OPTS $dec_opt $FLAGS \ + ffmpeg $DEC_OPTS $ddc_opt -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 |