diff options
| author | Marton Balint <cus@passwd.hu> | 2015-11-16 01:25:19 +0100 |
|---|---|---|
| committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-11-16 11:05:21 +0100 |
| commit | c9944f75961038e0631efa6d3637b9438c6d6238 (patch) | |
| tree | 92f04a054bf02824f6a53ce6abafea0b2c92139e /tests | |
| parent | 9bd4f26b55c88885c98fb47157ea62300f3dc293 (diff) | |
| download | ffmpeg-c9944f75961038e0631efa6d3637b9438c6d6238.tar.gz | |
fate: fix concat demuxer extended tests on windows
Line endings do matter to md5sum...
Signed-off-by: Marton Balint <cus@passwd.hu>
Diffstat (limited to 'tests')
| -rwxr-xr-x | tests/fate-run.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/fate-run.sh b/tests/fate-run.sh index 6d4615876b..966cbe24f8 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 > $packetfile + run ffprobe${PROGSUF} -show_streams -show_packets -v 0 -fflags keepside -safe 0 $extra_args $concatfile | sed 's/\r//g' > $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 |