[FFmpeg-cvslog] fate: fix concat demuxer extended test portability

Marton Balint git at videolan.org
Mon Nov 16 18:08:14 CET 2015


ffmpeg | branch: master | Marton Balint <cus at passwd.hu> | Mon Nov 16 13:19:40 2015 +0100| [bcac6416b8f5384b4c143f8f970dd9e23dacd132] | committer: Marton Balint

fate: fix concat demuxer extended test portability

Sed \r is not portable, it does not work on freebsd, hopefully tr -d will.

Signed-off-by: Marton Balint <cus at passwd.hu>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=bcac6416b8f5384b4c143f8f970dd9e23dacd132
---

 tests/fate-run.sh |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/fate-run.sh b/tests/fate-run.sh
index 966cbe2..bba6f42 100755
--- a/tests/fate-run.sh
+++ b/tests/fate-run.sh
@@ -262,7 +262,7 @@ concat(){
     awk "{gsub(/%SRCFILE%/, \"$sample\"); print}" $template > $concatfile
 
     if [ "$mode" = "md5" ]; then
-      run ffprobe${PROGSUF} -show_streams -show_packets -v 0 -fflags keepside -safe 0 $extra_args $concatfile | sed 's/\r//g' > $packetfile
+      run ffprobe${PROGSUF} -show_streams -show_packets -v 0 -fflags keepside -safe 0 $extra_args $concatfile | tr -d '\r' > $packetfile
       do_md5sum $packetfile
     else
       run ffprobe${PROGSUF} -show_streams -show_packets -v 0 -of compact=p=0:nk=1 -fflags keepside -safe 0 $extra_args $concatfile



More information about the ffmpeg-cvslog mailing list