diff options
| author | Måns Rullgård <mans@mansr.com> | 2010-08-02 19:44:58 +0000 |
|---|---|---|
| committer | Måns Rullgård <mans@mansr.com> | 2010-08-02 19:44:58 +0000 |
| commit | 42907c6ab5e41ca29db3454851e15bb0bce3601d (patch) | |
| tree | 2964f6e091f1250542aae15083794a25db0aca3f /tests | |
| parent | 440e3b2f7f39487f2bc2c12f91126e1bc33d6954 (diff) | |
lavfi-regression: trim \r line ends from showfiltfmts output
This is required when cross-testing on dos-like targets.
Originally committed as revision 24667 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'tests')
| -rwxr-xr-x | tests/lavfi-regression.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/lavfi-regression.sh b/tests/lavfi-regression.sh index ca77741a72..d30783f019 100755 --- a/tests/lavfi-regression.sh +++ b/tests/lavfi-regression.sh @@ -44,9 +44,9 @@ do_lavfi_pixfmts(){ # exclude pixel formats which are not supported as input $ffmpeg -pix_fmts list 2>/dev/null | sed -ne '9,$p' | grep '^\..\.' | cut -d' ' -f2 | sort >$exclude_fmts - $showfiltfmts scale | awk '/^OUTPUT/{ print $3 }' | sort | comm -23 - $exclude_fmts >$out_fmts + $showfiltfmts scale | awk -F '[ \r]' '/^OUTPUT/{ print $3 }' | sort | comm -23 - $exclude_fmts >$out_fmts - pix_fmts=$($showfiltfmts $filter | awk '/^INPUT/{ print $3 }' | sort | comm -12 - $out_fmts) + pix_fmts=$($showfiltfmts $filter | awk -F '[ \r]' '/^INPUT/{ print $3 }' | sort | comm -12 - $out_fmts) for pix_fmt in $pix_fmts; do output=${test}-${pix_fmt}.nut do_video_encoding $output "" \ |