From patchwork Sun Nov 13 19:57:15 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Oneric X-Patchwork-Id: 34858 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:999a:b0:a4:2148:650a with SMTP id ve26csp2066006pzb; Sun, 13 Nov 2022 11:57:45 -0800 (PST) X-Google-Smtp-Source: AA0mqf4k5hNvffY/uT7wTNUgTFNyBjjrk6GKzQ+M9UH6YCJwy0C1pJ4SbMPq3/ZE7fmEd1w6BCAs X-Received: by 2002:a17:907:8b89:b0:788:3a75:dc5 with SMTP id tb9-20020a1709078b8900b007883a750dc5mr7801411ejc.537.1668369464992; Sun, 13 Nov 2022 11:57:44 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1668369464; cv=none; d=google.com; s=arc-20160816; b=TUqBlAnB+d/3XYB5vcRzW9THY4WUPtuW8r7RB8g7LcARv3LPTwHXl1HOKGjJWZe86B 3ZYcU126vWESqJtMds7xkuKW0lkYzpnNZMSL8hds3wkFU9HvVG1VTRkCrLj4qTRWjxV2 sKm9B8xPFeceZe2OQReNZAEDiSkYz6XW06JiuOEq2oVygp3SUyeKzJ4xMU9365+rxC95 I/2LwGHJ6QvQdExk6K6cBmerwSgmb8xvtE3LdM0PcoQfCD3hFqQsD/FXaC4BHchpVALA QgnORIOghhT8WCCNL8QoywIJ2qzwGgFuWtcmhaQPjnRSLU6Ra6I5zBbJkRY3ixlzaXrl 9v9Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:message-id:date:to:from :dkim-signature:delivered-to; bh=Kprg5KFLwr6osV4wCs1BkcTYSzxHUMr9ZfO7yCzszEQ=; b=FygPOjhlNixBJY8tW2ITt6rKdZTlSaTLrGMFn4ZcnVQ8z82qtzBZqAgoa5ZoFPOeWH bvcuuoLHVXiItHtZKEwKHWjR5imEDryHvBlpKeJsgHeqqanoPs9airW23IpJccQtnMXN drAfjANr2dwpJ7C44I0j9Lrmyin2dlDitSCjAdAHLqCR7qTZRwu87If24FwY3uX/+b0I Z+mnknpf6Fi8as7E6zXzYye57+2faRL3RGYz70Y55wDSvO1yyYUn2DYgsPz/Oz29EZFR pVDNGqzfBu+d9Tm3rtIzn+S1Qkd+RSMdNJwiUj5y7gGq5k1UlrYZZ1sdc3/V9AClFHWL JfDA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@oneric.de header.s=strato-dkim-0002 header.b=jGmNUIk4; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id jz3-20020a170906bb0300b00783df65ae5esi6236231ejb.683.2022.11.13.11.57.44; Sun, 13 Nov 2022 11:57:44 -0800 (PST) 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=@oneric.de header.s=strato-dkim-0002 header.b=jGmNUIk4; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 412E268B5F8; Sun, 13 Nov 2022 21:57:41 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mo4-p00-ob.smtp.rzone.de (mo4-p00-ob.smtp.rzone.de [85.215.255.21]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 24E1E68B5F8 for ; Sun, 13 Nov 2022 21:57:34 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; t=1668369453; s=strato-dkim-0002; d=oneric.de; h=Message-Id:Date:Subject:To:From:Cc:Date:From:Subject:Sender; bh=2NZg9erIkxyDRN6Cdz3H1CdBAO2j9Io3s8QI//Uzn9w=; b=jGmNUIk4eO7qUTavu37BHoXCUh3gtDv+7p1u2Fz4D0IZwMn7cKPGQEqtb4onSyw6xo jlEJ/ioRF8NqamaUbHGlo/61nImHp1q0ywn/DhpKsHnHYbC/J8ejqEyeuZVSF3dBXpBc eiBmRUbYv3WUFkLzrPdVfwJ4qzxadSfPP6cEPbcJHXEMEcOFIVRarI2q2LnoiK9RpWpE TQ5+hFe3sBj0nVg6CraEGlYNxH+oda+OseQMrKnaiYzQTleqzybLgnFJRdfnI5Q/Bmoy VUy+bugjn3UR+xEw2Bh0CsG5K4OngIaVmh9waEVXz4xgpJz0Z0OO5hiApmARvgjabfSV XLXw== Authentication-Results: strato.com; dkim=none X-RZG-AUTH: ":I2IBZ0mrW/AWQXwgB4oxKM1YsW1lFUznrLvi/XReWqAAlWwZ8wlvfXmGs4jUQ0oz8ZbhHexs8fhgUyYHd48hugDaTPD0scTjgixgxauA" X-RZG-CLASS-ID: mo00 Received: from koenig-desktop.workgroup by smtp.strato.de (RZmta 48.2.1 AUTH) with ESMTPSA id V28b60yADJvX2Bs (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256 bits)) (Client did not present a certificate) for ; Sun, 13 Nov 2022 20:57:33 +0100 (CET) From: Oneric To: ffmpeg-devel@ffmpeg.org Date: Sun, 13 Nov 2022 20:57:15 +0100 Message-Id: <20221113195718.17752-1-oneric@oneric.de> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 0/3] Some small ASS conversion fixes 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: ElhxMkmTHr3K This fixes colours and font selection for files converted to ASS v2 == On Nicolas George’s request resent with plain text diff for the updated refernce files. There is no other change and applying the diff of v1 yields equal results to v2. Those files do intentionally contain CRLF line endings, but apart from tests/ref/fate/sub-scc they are not marked as "diff eol=crlf" in .gitattributes, so the diff (intentionally) contains some CRLF lines as well. Patchwork has or at least used to have bugs dealing with CRLF diffs. In particular it may wrongly fail to apply the patch (I believe this is fixed by now though) and the buttons for downloading the diff or pasting it into the clipboard corrupt line endings making the diff useless. Instead directly apply the email in your inbox or use patchwork’s mbox download. If your git is configured strictly, you may also need to use git am --keep-cr ... . (Or just apply v1) v1 == Original version sent using binary diffs for reference files. Oneric (3): avcodec/ass: fix comment avcodec/ass: accurately preserve colours avcodec/ass: specify a permissive encoding libavcodec/ass.c | 5 +++-- tests/ref/fate/sub-aqtitle | 3 ++- tests/ref/fate/sub-cc | 3 ++- tests/ref/fate/sub-cc-realtime | 3 ++- tests/ref/fate/sub-cc-scte20 | 3 ++- tests/ref/fate/sub-charenc | 3 ++- tests/ref/fate/sub-jacosub | 3 ++- tests/ref/fate/sub-microdvd | 3 ++- tests/ref/fate/sub-movtext | 3 ++- tests/ref/fate/sub-mpl2 | 3 ++- tests/ref/fate/sub-mpsub | 3 ++- tests/ref/fate/sub-mpsub-frames | 3 ++- tests/ref/fate/sub-pjs | 3 ++- tests/ref/fate/sub-realtext | 3 ++- tests/ref/fate/sub-sami | 3 ++- tests/ref/fate/sub-sami2 | 3 ++- tests/ref/fate/sub-scc | 3 ++- tests/ref/fate/sub-srt | 3 ++- tests/ref/fate/sub-srt-badsyntax | 3 ++- tests/ref/fate/sub-stl | 3 ++- tests/ref/fate/sub-subviewer | 3 ++- tests/ref/fate/sub-subviewer1 | 3 ++- tests/ref/fate/sub-vplayer | 3 ++- tests/ref/fate/sub-webvtt | 3 ++- tests/ref/fate/sub-webvtt2 | 3 ++- 25 files changed, 51 insertions(+), 26 deletions(-)