From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTPS id 1EAAC4EABD for ; Tue, 13 May 2025 14:24:00 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 17193687DA0; Tue, 13 May 2025 17:23:52 +0300 (EEST) Received: from mail-pf1-f176.google.com (mail-pf1-f176.google.com [209.85.210.176]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 28A4C687AB8 for ; Tue, 13 May 2025 17:23:40 +0300 (EEST) Received: by mail-pf1-f176.google.com with SMTP id d2e1a72fcca58-7424ccbef4eso3101818b3a.2 for ; Tue, 13 May 2025 07:23:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1747146218; x=1747751018; darn=ffmpeg.org; h=cc:to:mime-version:content-transfer-encoding:fcc:subject:date :references:in-reply-to:message-id:from:from:to:cc:subject:date :message-id:reply-to; bh=lYJiNGMaikq5TgwjI+mntcUooLsk4g0r9WjkDynGLks=; b=muC33CygLJ4V328hAcnfwNPgV0jPlpTIaguKp8lqbhRuvwrH93zSDzVkSGH3HkhC9T WGLJGB63negXCjHQaN9yC0mTG1vYEOxL6h/N5zDdf7854ur4i9WpClF5wR4+wfKTP7H9 V7CcwJBUjg+r1dkR24anfxMCivUUdOTkjuJW4bfSM4qlH5fnDz+Q/rz1rQ4KcyLkVtZ4 nGo0ZLthDorhMcE/ySIspbtPGaFlhrtv9AxbofQH8vHuzCuatVGvVsUCR1dUs5W6bVMA iaJLbdCNzt95i2E+pfAF2SQEF3idTXIQqMw642l7zV0Im0zT6sC+rh02ql+6DVZHtoeu WL7Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747146218; x=1747751018; h=cc:to:mime-version:content-transfer-encoding:fcc:subject:date :references:in-reply-to:message-id:from:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=lYJiNGMaikq5TgwjI+mntcUooLsk4g0r9WjkDynGLks=; b=FIkmy8zE/jqsI6/4AXoL1mjpnpJ4mk5mIpbLBZRwARzLbrdJ5xWrBzEo6MCwpb5P36 B9mu+EyCX/Eb1F8kWQh4dSiZuS48iySYdgz7fTBSE0zTKuoohsJzJ9A1FuRubx4UpbVx li3lGf4sxsRQizp0wLQKUqXrOYKnEKM3SOvpz9WqO5Rl5rXrbTkU6lmZW0E3DFST5KCX xOmljymqefN3mpKwSHcYqMC80rLjrXZej9wpXW6Plqo7PIednFhvx4X9o9XEctJMnuGA 8Djk32Nw/sGiEYpv3GcdJSXDQULLKdJvge4PnnRI7LlS/FX5DHrUmc4/boak+Th0oU7M r5yA== X-Gm-Message-State: AOJu0YyogpW42QhJFRGdIw4gQeRrfFOWDhV4aVMAFCUsrluWCMB8ErHy RttCRKjpwgUcy6YmqYLkTzNlY72dHqZH25JZ0tILvwRUdKmoaXuuxRUVoA== X-Gm-Gg: ASbGncu0H0TEWF++Icwh5W4yjFuo02msdWPsAkPS9HKfeaPQ4t0aYVX4SFgZKnJzd62 bX/zrUqireqGWR+MHEO/MeK3J8KRkIua/S2z/IldZesKzwmU1EI/ubsTpLmW3B4voq/khS7CG8S 3amPk8CDUAioBdKPHnbEOVq8G4VlD5ojssppQY1KC1nZW9dq9XhgvMcB7pLn2BWP/Ies3NAuYqb zYyQNup1P2VtDUcYb+dZMloVXQx790BrOC6096SGzblB9zsGQuGk005QUkgSE6FDuch3yVSj/St OV+GRHeFj03Z1cfGLGBVbZNaMNGbf4t2lKWbwNEGqLgpYbbX0i5lHZuoEPIJPRpvLzwJFA== X-Google-Smtp-Source: AGHT+IF0mV78irD/1S/Q3TW/V3XNZ6FIp7RY0uNyFtrEJweGaU2K5WXcW9vYcxulc1LAYIfKqeHCFQ== X-Received: by 2002:a05:6a00:181b:b0:732:2923:b70f with SMTP id d2e1a72fcca58-7423bc478ccmr22595827b3a.11.1747146218386; Tue, 13 May 2025 07:23:38 -0700 (PDT) Received: from [127.0.0.1] (master.gitmailbox.com. [34.83.118.50]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-7423770447asm7745432b3a.32.2025.05.13.07.23.38 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 13 May 2025 07:23:38 -0700 (PDT) From: softworkz X-Google-Original-From: softworkz Message-Id: In-Reply-To: References: Date: Tue, 13 May 2025 14:23:25 +0000 Fcc: Sent MIME-Version: 1.0 To: ffmpeg-devel@ffmpeg.org Subject: [FFmpeg-devel] [PATCH v2 1/3] tests/fate: Fix subtitle fate tests on Windows X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Cc: softworkz Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: From: softworkz ..when checked out with autocrlf=on, which is Git default on Windows. Signed-off-by: softworkz --- .gitattributes | 38 +++++++++++++++++++++++++++++++++++++- 1 file changed, 37 insertions(+), 1 deletion(-) diff --git a/.gitattributes b/.gitattributes index b64bbed2eb..eaf7f7f9a1 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,2 +1,38 @@ *.pnm -diff -text -Changelog merge=union +Changelog merge=union +tests/ref/fate/sub-aqtitle eol=lf +tests/ref/fate/sub-ass-to-ass-transcode eol=lf +tests/ref/fate/sub-cc eol=lf +tests/ref/fate/sub-cc-realtime +tests/ref/fate/sub-cc-realtime eol=lf +tests/ref/fate/sub-cc-scte20 eol=lf +tests/ref/fate/sub-charenc eol=lf +tests/ref/fate/sub-dvb eol=lf +tests/ref/fate/sub-jacosub eol=lf +tests/ref/fate/sub-lrc-remux eol=lf +tests/ref/fate/sub-microdvd eol=lf +tests/ref/fate/sub-microdvd-remux eol=lf +tests/ref/fate/sub-movtext eol=lf +tests/ref/fate/sub-mpl2 eol=lf +tests/ref/fate/sub-mpsub eol=lf +tests/ref/fate/sub-mpsub-frames eol=lf +tests/ref/fate/sub-pgs-remux eol=lf +tests/ref/fate/sub-pjs eol=lf +tests/ref/fate/sub-realtext eol=lf +tests/ref/fate/sub-sami eol=lf +tests/ref/fate/sub-sami2 eol=lf +tests/ref/fate/sub-scc-remux eol=lf +tests/ref/fate/sub-srt eol=lf +tests/ref/fate/sub-srt-badsyntax eol=lf +tests/ref/fate/sub-srt-empty-events eol=lf +tests/ref/fate/sub-srt-madness-timeshift eol=lf +tests/ref/fate/sub-srt-rrn-remux eol=lf +tests/ref/fate/sub-ssa-to-ass-remux eol=lf +tests/ref/fate/sub-stl eol=lf +tests/ref/fate/sub-subviewer eol=lf +tests/ref/fate/sub-subviewer1 eol=lf +tests/ref/fate/sub-ttmlenc eol=lf +tests/ref/fate/sub-vplayer eol=lf +tests/ref/fate/sub-webvtt eol=lf +tests/ref/fate/sub-webvtt2 eol=lf +tests/ref/fate/sub-webvttenc eol=lf -- ffmpeg-codebot _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".