From patchwork Mon Feb 19 21:42:27 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Oneric X-Patchwork-Id: 46371 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:dda5:b0:19e:cdac:8cce with SMTP id kw37csp1510851pzb; Mon, 19 Feb 2024 13:43:25 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCUIXJqau9lVIZCg/TOgLmDwjBs7TZunKIRxw37zHrt6XA3sOioyDG5j9iQGCA51oZSSQxXxuqj+og7r6aNsYtF1YEJg2KDkwNDi+Q== X-Google-Smtp-Source: AGHT+IGSlkWl8GgSy90QpFFjwIB4kqaOt3K9jkyGFGjG0y1q/n6cOHDrKRWU0vkN7lOr6gZNSLPc X-Received: by 2002:a17:906:8cf:b0:a3e:afbf:1800 with SMTP id o15-20020a17090608cf00b00a3eafbf1800mr2372236eje.6.1708379005535; Mon, 19 Feb 2024 13:43:25 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id qb2-20020a1709077e8200b00a3e91ecd95fsi1311555ejc.121.2024.02.19.13.43.25; Mon, 19 Feb 2024 13:43:25 -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=eUHn8UXF; dkim=neutral (no key) header.i=@oneric.de header.s=strato-dkim-0003; arc=fail (body hash mismatch); 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 0A4D668D420; Mon, 19 Feb 2024 23:42:53 +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 [81.169.146.218]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2559368D3FC for ; Mon, 19 Feb 2024 23:42:42 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; t=1708378961; cv=none; d=strato.com; s=strato-dkim-0002; b=FnNCav0ydSSBWktdjoPaxz6dIYZfn7ywFjQV5xZ1AtTd9R1gKOLH4VhDpvWY44Bmr9 of0Vb12TzCBsUQB0v9dVHiFiO62eCWSkcFYQKkfHtjoKDNYJ6/z4I0ViRKDA6LpEanxZ kC1YGKv8lcWwVbWPywSJ9FHCru4MeEsTHd7iCSBsnFlw5nT0akWP+u7NiS6PT7Cl381X bZ5ase77AXf3RqPNgefw/IIPujG5o9hOd92s9PkX3zayZSCYjHm3ZGGQxss9s+ADoSW+ qf0WhR/X3ymeJF+ImRgPRAYwY9xFNAOPi3jXGTeR1PZjvolL8r67spI4xsmFdcIWMoFQ OBwA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; t=1708378961; s=strato-dkim-0002; d=strato.com; h=References:In-Reply-To:Message-Id:Date:Subject:To:From:Cc:Date:From: Subject:Sender; bh=AoMopDpVlNnYClKEYwQ+Ay3YgB13He6KHZR+UpdQzfs=; b=TAOnOPbz5tkHfT9/5zrkFZxIEp2yPl0I8NCj/13z2SiD+9mIbgdkJKlf4SZcgLFhOq CcjtqRo5ZbWn0HNnWPJ7Ws6eKfLKii5iGjTMyDWNinpEh/ER6ELU6tV68WjS3X0WcmQ1 bIygl9R7Asa1e2ZQot45SeQI4ogRaZQn11IM4AQeDVs6DoGubGIz9wVT3aXj2/74Bcae 8X6kMSSXayvHd0kHcoJ8wudY4gmuBSNbzqKCi3gOb6AJcFVvdMgrV/MTeM1ppEGx9XOQ V/8nfJFlr6CAl8qYEAMIFQIfBTXj/1n9WU8b+Ij4K8Cu0UgZ+foTQfTj19eU5ZDlukdN YJLA== ARC-Authentication-Results: i=1; strato.com; arc=none; dkim=none X-RZG-CLASS-ID: mo00 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; t=1708378961; s=strato-dkim-0002; d=oneric.de; h=References:In-Reply-To:Message-Id:Date:Subject:To:From:Cc:Date:From: Subject:Sender; bh=AoMopDpVlNnYClKEYwQ+Ay3YgB13He6KHZR+UpdQzfs=; b=eUHn8UXFNT1kr8FycrFMqGSPTOL4UOYTTjFI+5aUPDyU3FBkcNetqpC7Q5C119v/BG yvcz+yiBfrc9g8qXlDpvYLBCgmaeP/ohKHQ2OOtIzqC9JZh3HW4zR2iRSm+EY7ReXBNB WtfCgyLaur7Cg2aYeb+LIukjt5Yz4dM+hqM/pj/ArmqRbN9CG02zJEMZuHK3nKq9V0Nq FzvAKMENsD4QGhzRpl7WHtAwY6jClJ7GI0oI8xLT5lfl1ulaqXVZCOR+tVJohZB3jiT5 WXYx7eK1pu1CNaChVyckB1G1pet+DEHiMfgleDD1CZXChJNWgRaiBxMC1/+BFtETbVg8 Go9Q== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; t=1708378961; s=strato-dkim-0003; d=oneric.de; h=References:In-Reply-To:Message-Id:Date:Subject:To:From:Cc:Date:From: Subject:Sender; bh=AoMopDpVlNnYClKEYwQ+Ay3YgB13He6KHZR+UpdQzfs=; b=mAnUOVHBrGwCbPpVB1nfZgWDOyddBYmREzCHVRNUrSHOFRgmCcuduDuBxxifg/05mh vyd7gST6l+3CdV1TV3Ag== X-RZG-AUTH: ":I2IBZ0mrW/AWQXwgB4oxKM1YsW1lFUznrLvi/XReWqAAlWwZ8wlvfXmGs4jUQ0oz8ZbhHexs8fhgUyUBddsh74Htfavbxf07Su2y8qQ=" Received: from abhoth.workgroup by smtp.strato.de (RZmta 49.11.2 AUTH) with ESMTPSA id x7ec2e01JLgfXQo (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256 bits)) (Client did not present a certificate) for ; Mon, 19 Feb 2024 22:42:41 +0100 (CET) From: Oneric To: ffmpeg-devel@ffmpeg.org Date: Mon, 19 Feb 2024 22:42:27 +0100 Message-Id: <20240219214227.19814-5-oneric@oneric.de> In-Reply-To: <20240219214227.19814-1-oneric@oneric.de> References: <20240219214227.19814-1-oneric@oneric.de> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v4 4/4] avocdec/ass: simplify linebreaks 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: C3iSLKngjZ5c ff_ass_subtitle_header_* still used explicit CRLF linebreaks eventhough they will get normalised to LF later since commit 7bf1b9b35769b37684dd2f18a54f01d852a540c8. Just directly use LF. --- libavcodec/ass.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/libavcodec/ass.c b/libavcodec/ass.c index e7a1ac0eb5..927b801404 100644 --- a/libavcodec/ass.c +++ b/libavcodec/ass.c @@ -35,15 +35,15 @@ int ff_ass_subtitle_header_full(AVCodecContext *avctx, int border_style, int alignment) { avctx->subtitle_header = av_asprintf( - "[Script Info]\r\n" - "; Script generated by FFmpeg/Lavc%s\r\n" - "ScriptType: v4.00+\r\n" - "PlayResX: %d\r\n" - "PlayResY: %d\r\n" - "ScaledBorderAndShadow: yes\r\n" - "YCbCr Matrix: None\r\n" - "\r\n" - "[V4+ Styles]\r\n" + "[Script Info]\n" + "; Script generated by FFmpeg/Lavc%s\n" + "ScriptType: v4.00+\n" + "PlayResX: %d\n" + "PlayResY: %d\n" + "ScaledBorderAndShadow: yes\n" + "YCbCr Matrix: None\n" + "\n" + "[V4+ Styles]\n" /* ASS (v4+) header */ "Format: Name, " @@ -54,7 +54,7 @@ int ff_ass_subtitle_header_full(AVCodecContext *avctx, "Spacing, Angle, " "BorderStyle, Outline, Shadow, " "Alignment, MarginL, MarginR, MarginV, " - "Encoding\r\n" + "Encoding\n" "Style: " "Default," /* Name */ @@ -65,11 +65,11 @@ int ff_ass_subtitle_header_full(AVCodecContext *avctx, "0,0," /* Spacing, Angle */ "%d,1,0," /* BorderStyle, Outline, Shadow */ "%d,10,10,10," /* Alignment, Margin[LRV] */ - "1\r\n" /* Encoding */ + "1\n" /* Encoding */ - "\r\n" - "[Events]\r\n" - "Format: Layer, Start, End, Style, Name, MarginL, MarginR, MarginV, Effect, Text\r\n", + "\n" + "[Events]\n" + "Format: Layer, Start, End, Style, Name, MarginL, MarginR, MarginV, Effect, Text\n", !(avctx->flags & AV_CODEC_FLAG_BITEXACT) ? AV_STRINGIFY(LIBAVCODEC_VERSION) : "", play_res_x, play_res_y, font, font_size, primary_color, secondary_color, outline_color, back_color,