diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-11-10 11:25:08 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-11-10 11:25:29 +0100 |
| commit | a7d451c1dd754c6345dfaa0d2416f1adba20ef08 (patch) | |
| tree | 7ec3051bdfe8c7f3bc191cf8c14a39d6f0d878a8 | |
| parent | ff9b21776b8d944838b3698f529447d287fe4ed0 (diff) | |
| parent | e1ee0521a698809ed216e9e5c11bd2bbb466ed04 (diff) | |
| download | ffmpeg-a7d451c1dd754c6345dfaa0d2416f1adba20ef08.tar.gz | |
Merge remote-tracking branch 'github/master'
* github/master:
tests: Fix test name for pixfmts tests
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rwxr-xr-x | tests/fate-run.sh | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/tests/fate-run.sh b/tests/fate-run.sh index f00a0be97f..f78e4fcfd5 100755 --- a/tests/fate-run.sh +++ b/tests/fate-run.sh @@ -203,12 +203,14 @@ pixfmts(){ $showfiltfmts $filter | awk -F '[ \r]' '/^INPUT/{ fmt=substr($3, 5); print fmt }' | sort >$in_fmts pix_fmts=$(comm -12 $scale_exclude_fmts $in_fmts) + outertest=$test for pix_fmt in $pix_fmts; do test=$pix_fmt video_filter "${prefilter_chain}format=$pix_fmt,$filter=$filter_args" -pix_fmt $pix_fmt done rm $in_fmts $scale_in_fmts $scale_out_fmts $scale_exclude_fmts + test=$outertest } mkdir -p "$outdir" |