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

[Timothy Gu]

tr -d '\r' ?

Timothy

El El lun, 16 de nov de 2015 a las 4:26 AM, Marton Balint <cus at passwd.hu>
escribió:

> Sed \r is not portable, it does not work on freebsd, hopefully awk will.
>
> Signed-off-by: Marton Balint <cus at passwd.hu>
> ---
>  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..a23f1e3 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 | awk '{gsub(/\r$/,""); print;}' >
> $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
> --
> 2.6.2
>
> _______________________________________________
> ffmpeg-devel mailing list
> ffmpeg-devel at ffmpeg.org
> http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
>