From patchwork Sat Apr 7 11:03:24 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gyan X-Patchwork-Id: 8347 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.1.70 with SMTP id c67csp470514jad; Sat, 7 Apr 2018 04:03:39 -0700 (PDT) X-Google-Smtp-Source: AIpwx4/4bSEX8yx7TQNMBIpennP7GH/9koND9Bxvw0oRU34V4gf0I2hIWgE3BgeBisiHIdGGbwrR X-Received: by 10.28.87.13 with SMTP id l13mr15206660wmb.120.1523099019433; Sat, 07 Apr 2018 04:03:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1523099019; cv=none; d=google.com; s=arc-20160816; b=RLTh7i13O3yavtIJc4OJeXasIG3zDFTb8EUpmC7Jk9zUVDrJnyZcxZFgBEVOJX3oMq Yg3Z1wfcMACiQtpDL/chIs4z3+HR72vVnVb2OE167lM6ZrgmhRQMwJZYxFoP4mCkyO02 OHKEPuj/BS3XqiJyRwQt0+Yi2EehW7YAbxSHwxy6HcoW7Xr245wXCVIjdm4TAKSHtpdL WDeVhfF3Q8RkD9SausDkHYOsUhxs6p68ILK9Nt7obxd8gSxOBTt8CcrC1RNrbh1G/gCL qXnVeDAoq/D/ekffkFhopEDVaU+ut93C9mVRQWN0ADPf5nC2RwaaCq3c9EJWrFksZtAT f4eA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:reply-to:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence:subject :content-language:mime-version:user-agent:date:message-id:from:to :dkim-signature:delivered-to:arc-authentication-results; bh=gu9K8qst8QkAou1t0IReXtz2UsOB6MP8nbVd4+agI9Q=; b=LS5W2IYbHhU5l+fKLKU5RKCTI+SKjgM24VUl6Dl/e/wcldQ+WDmFan8VPD4wVb/HTX hQeNWvJTlyrgxnnYf+eaI86HBFUCKH4DsJGDgi6qd/8Bl0t7TboxP/QN98Ueelg2E3aN ba9gJnFIaqrT3yzQ6qohCRvPH25VuvCKmDc14r8/J1DLJXia6tZmwX0eYpPRooxOnKgZ q+PG6QvuSuLkikSBMwVWWZj5CYpYv9UfCBV+qNy89TDxcgQ43LFVGVPV8cYfb7IdJAPv yiD4hVoeQ3QMKMs8s7uBkWlx2YrJ1qlF0AZoAzud0+m91IAr9ZWFFhX7Mu/Kfb7ncvVD sr7A== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=TCQM4sap; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id p15si7769177wmf.99.2018.04.07.04.03.38; Sat, 07 Apr 2018 04:03:39 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=TCQM4sap; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id A1428689CC2; Sat, 7 Apr 2018 14:03:14 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf0-f180.google.com (mail-pf0-f180.google.com [209.85.192.180]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 681DF68831C for ; Sat, 7 Apr 2018 14:03:08 +0300 (EEST) Received: by mail-pf0-f180.google.com with SMTP id q9so2557415pff.1 for ; Sat, 07 Apr 2018 04:03:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=to:from:subject:message-id:date:user-agent:mime-version :content-language; bh=/mhyf+XLya9hHrqkp1KAEaJxxzjRrkWLr+c81p4UrzI=; b=TCQM4sap5vMALMYQM1DCcUik/296BhlwMWYggzrnpiHblMBq0ReHzSl0K4nWRWNWCm 6u1T6wQRA3cxh1vxe5CxvvL/cfJ/SdWCJPVUioborvuytMsTjBwWOZTXGf6QEYoy6SEp LuazXk2BMsJqfdUE1W9Ukm8vFSCarNT3NCB6nR3hO/q5ZvBukhqK+yMBHwOelwZbeMG5 CH3Mc9jGMCFjehdI0MqmMv0dprIYSc1abJcn0m+oKjZvA0CpXjzMzWok6VI330H4oHa3 2VcoAcBmbFzzYyly7cXlVK71QEwQnDBSyPyQ+tlsan6PAldQfuYlbUqK0L9qhYHoHpPa BQtg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:to:from:subject:message-id:date:user-agent :mime-version:content-language; bh=/mhyf+XLya9hHrqkp1KAEaJxxzjRrkWLr+c81p4UrzI=; b=nM64AIds8ATsCGkcVCb1kNiJBTA+l2us58rUsSBQ7JCtaRGA7qvCS1PMd6/awt0KrS 6/2s1MLeD4pg9XNyAzn+FOqBrMLRe7RKCsxwH0IUVZi/DvOZB3lOIYSEYUld+63JXwWH S2Na/9QVXaYe/YAMxOrCHQMrXzXka+GfNaJsC7RVy3yt4tEePcDVJQbhLrJohvGQA8Zf pJ5aWkaFTRyG+oEuxc251ouGbst+NQM5Tq0Vb2dcq7K20pMrWCIpeyHcWqRko2wphMxK V7G0urJ7KItym0OUH6WlSbZ3bk3BthF+oMA/bJALKIoaOMrifSY+zZKvn5DUAsqlY8Bu Xj4A== X-Gm-Message-State: AElRT7H29/Rh5yvwhT7ygJqbTQg0+YWEKzqkNQvZrchdE2DMP98qOBsa HCKSmF3E1Pxw648mj87Q3VV+F5GO X-Received: by 10.98.174.6 with SMTP id q6mr23155946pff.140.1523099008345; Sat, 07 Apr 2018 04:03:28 -0700 (PDT) Received: from [192.168.1.225] ([183.87.143.248]) by smtp.gmail.com with ESMTPSA id j125sm28048777pfg.188.2018.04.07.04.03.25 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 07 Apr 2018 04:03:26 -0700 (PDT) To: ffmpeg-devel@ffmpeg.org From: Gyan Doshi Message-ID: <6a104fed-a099-9eca-7f31-169e85d5c9ee@gmail.com> Date: Sat, 7 Apr 2018 16:33:24 +0530 User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:52.0) Gecko/20100101 Thunderbird/52.7.0 MIME-Version: 1.0 Content-Language: en-US Subject: [FFmpeg-devel] [PATCH] gitattributes - force LF for some FATE srt and webvtt refs X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Please first read the commit msg below, which is, I hope, self-explanatory, but I want to note a few things. When searching to see how this issue was addressed in the past, I saw the recommendation was to set git global autocrlf to false. That's inadvisable because it affects checkout/clones of all other repos that the Windows user has. Setting repo local autocrlf to false is preferable but any local edits with CRLF will be merged unchanged. So the safe alternative to this patch is to set local autocrlf to input for Windows users and document that clearly in both Git How-to and ffmpeg-web.git/src/download. gitattributes will have to track any deliberate CRLF files. Regards, Gyan From e273754f53f2ad937e2ea05304dd554747fdc792 Mon Sep 17 00:00:00 2001 From: Gyan Doshi Date: Sat, 7 Apr 2018 13:31:55 +0530 Subject: [PATCH] gitattributes - force LF for some FATE srt and webvtt refs The SRT and WebVTT muxers only write out LF line endings. On Windows, the refs for a few related FATE tests are checked out, by default, as CRLF, causing these tests to fail. Patch forces these files to be checked out as LF. --- .gitattributes | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.gitattributes b/.gitattributes index 5a19b963b6..59e20ffc92 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,2 +1,6 @@ *.pnm -diff -text tests/ref/fate/sub-scc eol=crlf +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-webvttenc eol=lf