[SCM] libav/experimental: lavfi-regression: trim \r line ends from showfiltfmts output

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Jun 30 17:13:24 UTC 2013


The following commit has been merged in the experimental branch:
commit 42907c6ab5e41ca29db3454851e15bb0bce3601d
Author: Måns Rullgård <mans at mansr.com>
Date:   Mon Aug 2 19:44:58 2010 +0000

    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

diff --git a/tests/lavfi-regression.sh b/tests/lavfi-regression.sh
index ca77741..d30783f 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 "" \

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list