From patchwork Sat Apr 13 15:18:24 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kacper Michajlow X-Patchwork-Id: 48045 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:670b:b0:1a9:af23:56c1 with SMTP id wh11csp893049pzb; Sat, 13 Apr 2024 08:19:35 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUKmxgYjzb6XC5jk7T+O8yZ+w9LseTxHB0xkqDXkkV6eZl6jYEUB/wvlauq5Acmd3FDknl5p+toDEhogRbRNx3URiLN91e0ulj6mQ== X-Google-Smtp-Source: AGHT+IHvN/12q6o2v0aknM069a0NIl1RvAwX5U6u+XbqBaWpME414vAUB7fKcwhpAsXjvfGLlN2j X-Received: by 2002:ac2:446e:0:b0:516:cec0:1fbf with SMTP id y14-20020ac2446e000000b00516cec01fbfmr2986865lfl.63.1713021575039; Sat, 13 Apr 2024 08:19:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1713021575; cv=none; d=google.com; s=arc-20160816; b=zbwAixrLHUhuJEQSB1ALPxgJDT3HZXOPQ1dvCA3m/E97y3kiDqliGU8StfcvRaczVJ u0aaJIneZxTQ8hPlGl91ACeZTLXZlwegDjXH5At3vvqHeF/F7HlKKwaKI7AMv6sqd7Cl VmetarGVHidsRobbS5wsIgQsgdNrtAefowmA1cAS44vBss7eR94npUb2LKd9cJtImW3q knxruojQvDuW4Nh1PxYVEjMjMelV3dmGYmq5itivX3PPL1CXLSrKZOkkfAY4NU2Wa0Bz h7G+p8hsC8V95fMpGaKsvqFH30PU8YBUZuPs4mlNj/HGOtjqxWL4+7aWSS0i4fkOOFIt ttJA== 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:references:in-reply-to :message-id:date:to:from:dkim-signature:delivered-to; bh=Dm+5GwQj/PCRvxTAIZdzKOj21fqDBWm8zQ+W89YbErs=; fh=VehHF75ibtIiOcMFupA+RvAd8F/HWiWMZFlcjyRnn54=; b=KaL6ZRKXr6iXzZKyOE2N/kQU69BoLK1MDsxNk4+7FW11DXzjv45ygx7+uQnmyM7w8D i3F82fayXQYMReNG2O3Vr2GNH30tC0HNWCswdB06PoXiQcRnPpna/G64CmzbmtZu1PqG 27M2hblrzA4PwgejEvwOFLfkH3QfRUHJTDFAOTS3MP7XJSpn8QDu9GI0/ztLbAB7c3BB DrV4Lnub8qDhjunTsqsNGwDO02/9mDJgL/RLTR2mI3SlTQI1d5Go3G7cmLQhZJ0/NUO8 QQTxOdZY6Ma0cNNtcdbt27yuJdWBH248+2W28qM5S0tiowFq/dZOWu6T7fgSNQh0BCEG rtWA==; 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=mzq8X8LK; 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 h1-20020a05651211c100b00515cb04adf7si1681568lfr.391.2024.04.13.08.19.34; Sat, 13 Apr 2024 08:19:35 -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=mzq8X8LK; 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 EA3A268D343; Sat, 13 Apr 2024 18:19:31 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lf1-f54.google.com (mail-lf1-f54.google.com [209.85.167.54]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C371268D314 for ; Sat, 13 Apr 2024 18:19:25 +0300 (EEST) Received: by mail-lf1-f54.google.com with SMTP id 2adb3069b0e04-518c59b50b5so34736e87.3 for ; Sat, 13 Apr 2024 08:19:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1713021565; x=1713626365; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=JVj8QC4hYcg9xT5lNuL79vwUSbcIp97JKtCGi72c498=; b=mzq8X8LKWZMCKX16KT9JJpvmyWuD1ItPGx9PSuMG/dlwIU2+iQdRbqv7x+/cjdT2mk j6vrVZAiu2HbvHWSSarjA0v2u2wRb4cDf9xJfeewFXRv+cl60M9rilUqGuMLl91tJ57V 2wylPIrSHvBlpql49VQoPB7+bMbE0Cq5OJy6J4QI8SgRb9eSC1Ma3cUqO43jMBffaMSm lBdHh3MgkOswyuHrGe0PlmrP4Mza0K6QA1BF6JrwQBMR9IuxyD21ql3undcCmpOhUO/n UbmWL1C9U3494dNdUVpMQ8AE7YqSMXaI+4WKsCBkLIqm2iQEa3EoSYQLj0544e9NcLEC YAMg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1713021565; x=1713626365; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=JVj8QC4hYcg9xT5lNuL79vwUSbcIp97JKtCGi72c498=; b=bBy71BZfJn3jX+ve3Cg70jnfdOCYkZ5EJvvgwhV5CHwqLYT6SZm6m8g0FTzUtcQyDD OU2+qRAqEtHsZ/LYWm4m4g81mtWQ2XlIqk1BBBX4Mwg354Bmp3M771sb2KNzDv+e/mEq Pbgf8rpDlhqD64W5WUxq/U9T8q545bLJtGMzbo4f5FjY+hwWDxwE3V5en330RX63ZzMj HD02S0cozVfenOeFMgUOBdaRoC3gL2uKIbbb0Ida9R3YQTPApoG/uSTrkT8/IGRHaWC0 R2NT9xSaa0uslNoxF3tW6QV4Lw5SuTOlqP/JgYSQ/90E/+N2cUNjaNpxHPbtbTtAniQ/ 9vJg== X-Gm-Message-State: AOJu0YxI09S8OLs5hGJBMq0C8Wi4wG3bBM27FOJecyS3ryCkVVVJkMgy 2GDIP+k3nWODf3rjU3j0vfapcaredJGaxlt3zSulg85sR0ZOflrYJUmpbA== X-Received: by 2002:a19:7008:0:b0:513:5a38:f545 with SMTP id h8-20020a197008000000b005135a38f545mr3688231lfc.62.1713021564332; Sat, 13 Apr 2024 08:19:24 -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.19.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 13 Apr 2024 08:19:23 -0700 (PDT) From: =?utf-8?q?Kacper_Michaj=C5=82ow?= To: ffmpeg-devel@ffmpeg.org Date: Sat, 13 Apr 2024 17:18:24 +0200 Message-ID: <20240413151838.520-2-kasper93@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240413151838.520-1-kasper93@gmail.com> References: <20240413151838.520-1-kasper93@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/3] avcodec/libaribcaption: 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: +aZAloSKbefp Fixes remaining \r\n is ASS header after 57c545090d. --- libavcodec/libaribcaption.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/libavcodec/libaribcaption.c b/libavcodec/libaribcaption.c index 0b67d41772..46a2a591c5 100644 --- a/libavcodec/libaribcaption.c +++ b/libavcodec/libaribcaption.c @@ -522,14 +522,14 @@ static int set_ass_header(ARIBCaptionContext *ctx) av_freep(&avctx->subtitle_header); avctx->subtitle_header = av_asprintf( - "[Script Info]\r\n" - "ScriptType: v4.00+\r\n" - "PlayResX: %d\r\n" - "PlayResY: %d\r\n" - "WrapStyle: 2\r\n" /* 2: no word wrapping */ - "\r\n" - - "[V4+ Styles]\r\n" + "[Script Info]\n" + "ScriptType: v4.00+\n" + "PlayResX: %d\n" + "PlayResY: %d\n" + "WrapStyle: 2\n" /* 2: no word wrapping */ + "\n" + + "[V4+ Styles]\n" "Format: Name, " "Fontname, Fontsize, " "PrimaryColour, SecondaryColour, OutlineColour, BackColour, " @@ -538,7 +538,7 @@ static int set_ass_header(ARIBCaptionContext *ctx) "Spacing, Angle, " "BorderStyle, Outline, Shadow, " "Alignment, MarginL, MarginR, MarginV, " - "Encoding\r\n" + "Encoding\n" "Style: " "Default," /* Name */ @@ -549,11 +549,11 @@ static int set_ass_header(ARIBCaptionContext *ctx) "0,0," /* Spacing, Angle */ "%d,%d,%d," /* BorderStyle, Outline, Shadow */ "%d,10,10,10," /* Alignment, Margin[LRV] */ - "0\r\n" /* Encoding */ - "\r\n" + "0\n" /* Encoding */ + "\n" - "[Events]\r\n" - "Format: Layer, Start, End, Style, Name, MarginL, MarginR, MarginV, Effect, Text\r\n", + "[Events]\n" + "Format: Layer, Start, End, Style, Name, MarginL, MarginR, MarginV, Effect, Text\n", ctx->plane_width, ctx->plane_height, font_name, ctx->font_size, ASS_DEFAULT_COLOR, ASS_DEFAULT_COLOR,