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 2B8804EA34 for ; Mon, 12 May 2025 10:00:21 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 1906668C3E2; Mon, 12 May 2025 13:00:14 +0300 (EEST) Received: from mail-pf1-f170.google.com (mail-pf1-f170.google.com [209.85.210.170]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1A18368BF37 for ; Mon, 12 May 2025 13:00:01 +0300 (EEST) Received: by mail-pf1-f170.google.com with SMTP id d2e1a72fcca58-74237a74f15so4298429b3a.0 for ; Mon, 12 May 2025 03:00:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1747043999; x=1747648799; 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=U9kyWnWFQmnXkV2al07eT3tJ3RUuKs/YCPLlp6slaX81kbzDZugsL0kfLqt+IaC0bY BAReYOm892wBirvPXv74E/jGZstjfbPv410kpRNLxBBgWPHtwr81T80wcbIME67q4ktX UcrtfmKUaOBJKM3FjwE2KQEFJLfc1W7QPrxZKyZ7OHZJx/KyeyWHUn/+T5Cs2zow894m Dv9FrjcWGvk8a3YavzqjATMu2TGROXVwLVRfrKZq/nTKs3aoFoHFF2irQuP9GG2LOKF9 FDZyCpk3SdzoC6VqUFLrUPjWUjYnfgoS1CbghM5M9sfpEPjuobDRr0aDPlY6C2UZWuku HwLg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747043999; x=1747648799; 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=lx8mdJUNs1ukCZmKVyrEOK5R4OuRFt4XqYp+Ndzvx9EHzCY4ek/20GP3eN3vWrXP+6 /jkuEiS4HOjK9G0jpf7zZxS5GjR68yKMH0iGvF4m4SJYSa0L3COSj2IVsuhqsoU6peWE rzlMvxzdWqCddww+cu4IcpozT2LSt+Drdt0LnSUeHgB6sp2CGnmscthpJyeR6mbw1ojY zE9dY/vSMnQaxmQ2t18L9okGfgNEW4lJ1gW8KWUXJdiPVbDj/EpiiJu7v5Ck0c8hoXk6 9xQ6GHtiJE12iw1p480+flGpY8gyFzQyj5X6LmXinIYW9KzQesKaSzOIQSRPM8KL5ATZ nRLw== X-Gm-Message-State: AOJu0YyzIwAaFEysSENyYs+25pY3rxx9Yby2l37O3PqWipMMsw9TnLaC OOsH9MoCvoNH5tX3anuxsa6XhzyTeIsZfNyoWz7eQDTxg2HA/zMTOJZ+zA== X-Gm-Gg: ASbGncvYTDnyqMBS2GDi3F0XraFA25B7Z3Irsr/7ZTi7elL9Yo2T1b4UYM0pn4lUXSn l3Mo7UCYbe6z1mHLMPgRF59V9PaCmpGbJ2LZqbhlg91BqWVrGFb2i09p2YxfteH9ap06nbOW1/E T33uLnauvh/bw6oEpfc28dAsPVAitaDvald4GugjJ9NAeBL9j0WnWSCvgAbDadmU8/Y0jDZgBMB 0MesbomEmQICCTanWKs1KEMYMbhDY9tfNriJ3Pw4UPAQHaDcivP7dbQw4RWLgPOGYTEo8BTPj0e 11Fc9lvAlhuk05oHVtIsA6GECETvT+QIONlg2RlfeGvnSDUAs9+xAXfPtG5rje4bBCTXWrGFIqO zpR1Y X-Google-Smtp-Source: AGHT+IF0tw+WgnQ8TRdML/pux+YeBVOYlnH18dwMtiMp/xIVRBbgguU/qCVHm88jKk6cxdCGp/aRcg== X-Received: by 2002:a05:6a00:3d0f:b0:73b:71a9:a5ad with SMTP id d2e1a72fcca58-7423bfe4cecmr16697003b3a.16.1747043999240; Mon, 12 May 2025 02:59:59 -0700 (PDT) Received: from [127.0.0.1] (master.gitmailbox.com. [34.83.118.50]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-74237761dfcsm5713600b3a.75.2025.05.12.02.59.58 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 12 May 2025 02:59:59 -0700 (PDT) From: softworkz X-Google-Original-From: softworkz Message-Id: In-Reply-To: References: Date: Mon, 12 May 2025 09:59:45 +0000 Fcc: Sent MIME-Version: 1.0 To: ffmpeg-devel@ffmpeg.org Subject: [FFmpeg-devel] [PATCH 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".