[FFmpeg-devel] [PATCH 2/2] fate: fix concat demuxer extended tests on windows

[Hendrik Leppkes]

On Mon, Nov 16, 2015 at 3:39 AM, Michael Niedermayer
<michael at niedermayer.cc> wrote:
> On Mon, Nov 16, 2015 at 01:25:19AM +0100, Marton Balint wrote:
>> Line endings do matter to md5sum...
>>
>> 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 6d46158..966cbe2 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
>> --
>> 2.6.2
>
> the 2 patches fix fate on mingw32+64 here locally
>

Fixes both mingw and MSVC running on Windows as well, therefor applied!

Thanks for fixing the problem so quickly.