From patchwork Mon Feb 12 02:01:59 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Oneric X-Patchwork-Id: 46216 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:9002:b0:19e:cdac:8cce with SMTP id d2csp436187pzc; Sun, 11 Feb 2024 18:02:30 -0800 (PST) X-Google-Smtp-Source: AGHT+IEkhb1Talw7u2SgyjWFVbMtcyshNlqGubdBeNIMgOT3fmkRwphN01xChOskEXlBsp0JzWLY X-Received: by 2002:a05:6512:3e5:b0:511:8c69:c53f with SMTP id n5-20020a05651203e500b005118c69c53fmr1212577lfq.48.1707703350035; Sun, 11 Feb 2024 18:02:30 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCXCGY4/1qPKCX6kKhXlm9gLzqgu9mBYEZHPaXhaPm+0LOIJHjezr1KhwDjGNRdOb89xQtGtMJCtPQ9IwzUfRM791Mw0ET5YahFl6uMFbsLJShk/iifW7qk7/izc15RId0WEBKYbEac1wckG8T0pTG8YsvAKNl9sT8dQSLwepS7fjt5dHM05mF8Igl59j3mlU3eeEfaw7mGfX0pxH8DZgote96EiRyRVB1CUQQzvHPLyxtZ3w/scOUWfPANj6LnaWu74yuoqSEQGLfxX9zJ1J0EfDJFySfIz09CxyCss2SBeOxqfpQLxM8VIbbsaXbAxqY8F0Z/WR6oS383aGXJQim6Pg/QZGhcui9QkDkbKex9ZSb2/RAxhoZejO2Gw2RLG1HpzIwWeNI/TY733I5eMqm5A64nvKSlHzdIe7pIV0SymTgEPTIsE3REgd5mdVOk7QnNkdBWXuSy1onGIto6CVG2O36F7XA+hdpSKacvr9nVTV8Trvl4KdgN2WrQ0+U5VaC1gH0xPYZW5W02VbXPOk2QVCEL9skIuO0SWlht/1ZrQfBPQxZxM8DTXa09NxNhY6tOg1FBdEI3FfCCLws0heqv1F+b6nuh4oYlmm27bXKpzI7ILAu7uZE9nVJ3WoqV+odvCg/hT1CEfa3CoSeBtQlaxiOx3tKqBgrwIiipnBBNS4khxC0PliBXxwiY+ggNPNXADaMtrRGYOmLQqYndRsiZ+6Xp15KD8uZIMHQQ1aysMz6AN2eXbsj2TSHyaCBT2jyzsEroZoWEcvVMNsG+LNcZUWLoQO12JOjQmnT0aHmd40QGISM6sRDFDUTx9hQgymSkQsXyRAowcIwxoWFLlwyCRO2bwFQ+NLfuEpqb14ej3ybRLFe6EFCPI7KqYE61KoF76HBKUQlBOR27u4p6dgwLp//vBwMWQe/3lGGnBzQPUXM+qCxhuD5LCM/Qu+lywxbmtiy nZZHXI6nAnRjzq4LAoMiATVZdPbZu7++vuAYINQ0fCBEjR4LGTe9kxyzSeb4xF1m3TC/whIKnTUjGo81Q7K4k3o6nk9B1WIFSpYy8hSCpfdEu5QjxVQpPxZ98tTk1Lj26wTC6sRE6FF+jbV6gNGT4fMo3csXchiwl79KkWLpC8jaNQBpbvbEw80GqRK7i8EhjGPB4jMNzCmEcDP8eJNcYCT3SvV2k7SQOg3Gr2ALx0w0E0DeLd+vLtVGk878LgVqeFaEihk1uN6VwUn2BjKREo7v6Z8o7ZkW2rtGLY/0OHWBK/IUhbOzPkzaP6BxP0i9NywR9Wbt6Pvsy/vT6oL2GRRMKmEBcDB/gtLyJRmItdNFY9n+qVA/qet0Kkn5/oqUvotebAXIuuO1zQPFl5SkyIBGIz2b7brQon3Ch0l5m2pJw3J91RdoOWXCGXRwAq4P/fqxZqRAy5H3pc1arfc8cgEKZpWd9Tkq9KUXQjHidxRSo0Q1erBYrnt5OO6iIIeHZXYsGlCOBaNDpg5FBvIL8ZwcUiWUeyPzRRJMyxcI/K2BmYhEaws4eaEMmW82pQ/ItpI80uNUgeZNWHuxUqLdfc2Se8dGGs8Bejt1NYjXgfC553Tm/YKBntcsxbgM8= Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id go32-20020a1709070da000b00a3c4645f417si1698809ejc.49.2024.02.11.18.02.29; Sun, 11 Feb 2024 18:02:30 -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="s/W86R34"; dkim=neutral (no key) header.i=@oneric.de; 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 CB61868D13E; Mon, 12 Feb 2024 04:02:25 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mo4-p00-ob.smtp.rzone.de (unknown [85.215.255.22]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8D9EA68D0ED for ; Mon, 12 Feb 2024 04:02:18 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; t=1707703337; cv=none; d=strato.com; s=strato-dkim-0002; b=a3SwHox5UXfPWlQknb2iw8tKf4W6F5elA5r7czv5NrME+WBeZ82qPYhFneiYvQ9tn2 6b+DdZL9PVS/AuRRuaybqOYmAO8y/6SJ2vFQYCeheGea7E6JxbF4aVx28+gJ5Wqgh2zZ /+U4WJO5d2dIATTwPgVLTq0jcUzkelGDAMPwTLbjb6wDD87pr3lpwFinEvE7NXG1BRd7 0xdUJ85fwtGCq/1MZLlglhkUq6qbotb/X4cgv3ES4ELqPAyc81B4k1yiP4ZTAxEcPRMD oFJ/IouuclY9US4WyQYNorS7Ih+z2Eels4Z2iZzc/lm/C3xhNu7sETQ+AORfhNXgJqda PTmg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; t=1707703337; 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=XHMUQcjFMGPJbPpac7Gnd+PYzRcEteWYs/nXKpr4QIq+7ZNnALaERexN6Xt93msXcR KS0VpZNdvbgbs05XcU3Mdi/FNToZ5wsp1dd3akhipJsNvoym6L52UA4fxHC1D7Z/+wFK u7Wwd2HNHZrCc+DZ7+vJwDz8RyFMQMh+IHTwzCcwMzSDBe7MjM/wLMhii7wto9rXK0xZ LYd2T37tFO/DNahp/1YdDOG479gOIHDOa293BCGUxt6GcTCrUnYV+u7F2H1D12aN/fWY YxK3fWaryp6Txj3E86nVKMFOFd8TkZyxfo+LhQcOQqMObDK3mvDOzUoPv69plsxjsUfk sPWg== 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=1707703337; 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=s/W86R34iIln/gwGVawD5r0ndCe6QbPjmNt7LPWAU/3U4c969yZtsY7NgqthJ8WfvD 0+dy+IwRof4Wt+0L8jjwDRFKKAeQa+YGHQjWJv04hh87DrlXS54A2+busyU9J8WnrWpg xI9oUzkfkAYpfH/JXb0lYMLyJk518moTYSs8Ehq5uYLK+fUnRIQ5RWBQrDHNMSpzmUqR fNHCSg5kaIPyp2xZQyRPpPmTIVb50R+Sxjr3xdZXsCRuBjymB6evy6GR9kLupNcpt0Xm FsVnAaq8Tl4hSYAnCGxGJUabl0CaicLhaG0T51JutR36dcJ9XTtMsqVwFDM+q/ShlPeY Fh2w== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; t=1707703337; 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=I7CPUrDwi0ntJedWr0Kc3DnckDG9dEHwCrvcRhh4sQq3mh5oboCL0TY9k91ElJjayq 8Z+TM3nqFlP0KSJYPYCg== X-RZG-AUTH: ":I2IBZ0mrW/AWQXwgB4oxKM1YsW1lFUznrLvi/XReWqAAlWwZ8wlvfXmGs4jUQ0oz8ZbhHexs8fhgUyJVddUhvSMyyTdkfRqedioxw5M6" Received: from abhoth.workgroup by smtp.strato.de (RZmta 49.11.2 AUTH) with ESMTPSA id x7ec2e01C22HBx5 (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256 bits)) (Client did not present a certificate) for ; Mon, 12 Feb 2024 03:02:17 +0100 (CET) From: Oneric To: ffmpeg-devel@ffmpeg.org Date: Mon, 12 Feb 2024 03:01:59 +0100 Message-Id: <20240212020159.6806-5-oneric@oneric.de> In-Reply-To: <20240212020159.6806-1-oneric@oneric.de> References: <20240212020159.6806-1-oneric@oneric.de> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v3 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: xNBrKsfbr70U 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,