From patchwork Sat Apr 13 15:18:23 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kacper Michajlow X-Patchwork-Id: 48044 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:670b:b0:1a9:af23:56c1 with SMTP id wh11csp892865pzb; Sat, 13 Apr 2024 08:19:09 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCW+iYTp6m/ICRcWZsciOUk1l33wsvhwp+HMaw4uoFpGYfc7BrQElYXivusdMQ+8Wv0llrSZN1C+zF5LNkXdg2VS/GN2/m/anlFcAA== X-Google-Smtp-Source: AGHT+IHYUtBRfGFwmi6zmGU/UYm9GGv9FUXCNAzFoHBC1ZeMVwidMxqzrdO8YkSmVU/UIcBIMIA8 X-Received: by 2002:a19:7604:0:b0:515:b0ef:2ae3 with SMTP id c4-20020a197604000000b00515b0ef2ae3mr3208066lff.39.1713021549616; Sat, 13 Apr 2024 08:19:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1713021549; cv=none; d=google.com; s=arc-20160816; b=FFtFjjlYrT6kDwjMdeAA9UqW0iee2i65y7z7neeexTpRPVzaMjxsH+d5a02UPFZ5s9 BVB8UuQoXWObpYMxGMXjEO7xvEYK3Lz2Ghm9YvtKrGJ/t7d93fV5PkC/fCNYUd4VoxlX +OLSPn5g0HQWEfJGELeKejpwCkb459ljuiYtcwu7Eze4yi0OpFcLwQks3AKFtEGp9Zwu cidp5/3922Yb2M3dCAEQHTqBWiO3obrwh2MOHTGGTd1AjGQ5XP0Inso0EdwEdtzI7DUp hnitnknUnSNhD+cZ0PR3xWxFA0BhB51KR4dJ4KppaVTT9oQRXJJEO+FvHioAMdM4Id0c 9Sug== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc: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=U9ftBQuNR6I7ihG9qO5U4cx/iyJqvnpzj3qD6Ln++0I=; fh=VehHF75ibtIiOcMFupA+RvAd8F/HWiWMZFlcjyRnn54=; b=kcAp/c8ejv2LZ1hHC4vymubA/6fjVpS+oewNQdymCgLem433pPgQLAOajtjXmateoo 6tLhDO0wkn7XiozrgFbYNhIv1MdXyrc2yt6STbuwlEShe51LtX2o2GmvxVIerLdug+tT T/9OalU6UBoaQAqfgSAwpSl8sc2agMNB4ZC2D3U6lcBIWQpp1f0qG04dpbSy+0v8YCov kh6x4DgNmpN5p86sX1jTXyb8fNG+m5qEginB8ucm8PpeCZ1D1v9LCJ7PT79G45TKSjYh vB0ehf7FZRg7gPzVf3OgEoi+AXIpRZ8LqHQ4aPnNakf8g39iDkY/I33QL/3HDueKS18y n9jA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b=C3kar4Dl; 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 dt9-20020a170907728900b00a46f27b23dcsi2921845ejc.432.2024.04.13.08.19.09; Sat, 13 Apr 2024 08:19:09 -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=20230601 header.b=C3kar4Dl; 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 9EDA868D331; Sat, 13 Apr 2024 18:19:05 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lf1-f52.google.com (mail-lf1-f52.google.com [209.85.167.52]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1D08468D2E6 for ; Sat, 13 Apr 2024 18:18:58 +0300 (EEST) Received: by mail-lf1-f52.google.com with SMTP id 2adb3069b0e04-518c59b50b5so34413e87.3 for ; Sat, 13 Apr 2024 08:18:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1713021536; x=1713626336; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=oU5nPnK/Ekl/aENobgbhyxvToWXARzc7kXCH+UcGOck=; b=C3kar4DlzU5InJRwN06DYPGY2Y+35V0LEHZlJQX3OWLxQ+ajzKNwrl8dqxcg9wEGGo x//Sz+SWb2spVIht4A5l27v+I+jFl/2/mndWm2CqCgfTEvnsy6RzqYqi3Gon4bmdvVxZ 2qgyEstATtr3rYY5A7iWoqqIkK6aHf2dr51AsPsuq7BDCLfR8YNXw7JiAmRm3IDWBT2D qzD5jxdetTaVurWG8HKC5eLcFxFYaaG2F5g44gGbDTyqUsbMIG3RbBvsIE4wVUT/jfW0 Cpqt6Oo3zCEN72qJfCALAwPengW4Ow5O/3bAhRaxhRVM9OStywbjPDyUCu+kBDZctAC+ w1+A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1713021536; x=1713626336; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=oU5nPnK/Ekl/aENobgbhyxvToWXARzc7kXCH+UcGOck=; b=ngg2W4RmjUZ8SvvPPK3Nj9VTBrPmH5yW76BgpEsBqtqeJJU7PyVVI90ZxQZ0W8Ocms Uv90lO3NQK2pRtDOzRcvJDZGKvCvLgs6GTAT9HThH51Fp05b+NgMs+Ne39owqCUeBb3i XYpaWpVQhfe5PievbaxXjFXCzDsIQtMdp9Kyzzc2r8uyYKyTjcFsLFeAdmC0ihyckoHt 28u8XhWfB0RhS4ryoca8nb0HS0FQ1LCoUv1KcglGYfCnl8/6dnDhRHe3WQoF8zs7mpQT /RQiLxsc+1nZDaECMyXU637kXB4IAyTXL+U6MQmbNngoCWOuTF7SspxVs1i1YBZLgCfS eBbA== X-Gm-Message-State: AOJu0YzdILLjxv1FiyGDc0GXR9D1DS3fRLffzz4o7iLhVXdHBL1GpZCH DvIY6YzCoFfaEqYROsBQjftmTIp/VhvpJwfaQ2rDrgz8F62m7GM5Ei4/0w== X-Received: by 2002:ac2:4d9b:0:b0:516:d33a:7571 with SMTP id g27-20020ac24d9b000000b00516d33a7571mr3844417lfe.8.1713021535664; Sat, 13 Apr 2024 08:18:55 -0700 (PDT) Received: from localhost.localdomain (89-74-12-251.dynamic.chello.pl. [89.74.12.251]) by smtp.gmail.com with ESMTPSA id w26-20020a05651204da00b00517626d22dcsm785862lfq.29.2024.04.13.08.18.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 13 Apr 2024 08:18:55 -0700 (PDT) From: =?utf-8?q?Kacper_Michaj=C5=82ow?= To: ffmpeg-devel@ffmpeg.org Date: Sat, 13 Apr 2024 17:18:23 +0200 Message-ID: <20240413151838.520-1-kasper93@gmail.com> X-Mailer: git-send-email 2.43.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/3] avcodec/libaribb24: change new lines to \n in ASS header 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: =?utf-8?q?Kacper_Michaj=C5=82ow?= Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 0t745x/vF37N Fixes remaining \r\n is ASS header after 57c545090d. --- libavcodec/libaribb24.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/libavcodec/libaribb24.c b/libavcodec/libaribb24.c index 009c995ded..0e4fa9935c 100644 --- a/libavcodec/libaribb24.c +++ b/libavcodec/libaribb24.c @@ -96,13 +96,13 @@ static int libaribb24_generate_ass_header(AVCodecContext *avctx) font_size = get_profile_font_size(avctx); 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" - "\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" + "\n" + "[V4+ Styles]\n" /* ASSv4 header */ "Format: Name, " @@ -113,7 +113,7 @@ static int libaribb24_generate_ass_header(AVCodecContext *avctx) "Spacing, Angle, " "BorderStyle, Outline, Shadow, " "Alignment, MarginL, MarginR, MarginV, " - "Encoding\r\n" + "Encoding\n" "Style: " "Default," /* Name */ @@ -124,11 +124,11 @@ static int libaribb24_generate_ass_header(AVCodecContext *avctx) "0,0," /* Spacing, Angle */ "%d,1,0," /* BorderStyle, Outline, Shadow */ "%d,10,10,10," /* Alignment, Margin[LRV] */ - "0\r\n" /* Encoding */ + "0\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) : "", plane_width, plane_height, ASS_DEFAULT_FONT, font_size, ASS_DEFAULT_COLOR,