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, 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, From patchwork Sat Apr 13 15:18:25 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kacper Michajlow X-Patchwork-Id: 48047 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:670b:b0:1a9:af23:56c1 with SMTP id wh11csp893102pzb; Sat, 13 Apr 2024 08:19:42 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWpeD1i3HkgIqkBqGNU4VER9u+2OrpqGVuif9CBX+p0f+cvnZYkReaHzw297fwcG3XsToRD57IMArC8ArVobCCB+Zz5KLyYzZqoMw== X-Google-Smtp-Source: AGHT+IFKkHH20zsA1YIKCj48la0QeDydO+WJX/HPwpmilG1JuS8DiPvHVow26nOF6pJgdE8xS9Sa X-Received: by 2002:a50:8add:0:b0:56e:2e77:169e with SMTP id k29-20020a508add000000b0056e2e77169emr4203328edk.20.1713021582474; Sat, 13 Apr 2024 08:19:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1713021582; cv=none; d=google.com; s=arc-20160816; b=pTly/Lph6Bb+75Z6AkDypOl3YGkNkDc+WdSVVO2lz9AcV8zoBHGNAnLmHAMiF0MVzz ckn/nSVKtotRwvJrJshJ+wfuNLvnheOI2+afZu0wMqgSOD4gd0e7jHnI+RwEVbp9IlG8 ZSP3dbkmSl2OJarrPUdjX/UqVBMkf5WRb04SN7gioTc1Baqf21M2PKfA1atnJAc1NzNt LN6Ukns6taPamszAS/FX+cr6tvolmOzfG1ekZmtTjS+tKpnGdBROPowT9eBqspRv+41H Q7A8Uep6imCMrvs5g2jOnr444wTYMiAlrS2fOwMecpa3pCfV3HMWWzo1BQKPLD0kYd7v bafA== 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=zGg8FmHjCmK0mC+5TgLa7J1aX1QDMf2dBNtipTy8w3c=; fh=VehHF75ibtIiOcMFupA+RvAd8F/HWiWMZFlcjyRnn54=; b=TLuiu/s8k/c8ojIhBImKs9AIN7vT/H+Xnhn9T7CExTTA6mFtfNTnfcUavUeyccznyN xFVYPvX+MoOh/62hqxQ1FHidJmVmxSAKxUMWv5ntl4oSPZZcpiXIMVJBGgj5He5MyNUe eyopZpm2E14hpaDaTEMLxVpODbMa7mverJes+dnMXXwlngN9KMDD10vz8LIMklSKiet/ Tqq809Ms2+rwwHLRF/ZSafyVXDVWffBGudYbwnF0BT4tl1m6Dev6M0TtIy55lrghk62q FRz7VjaaS9VGyiqRQRhTOvxM2PoM1JRz8cs7JkidFMzezB7vvnM2IIoD8/ZYV4lchFS6 oe4w==; 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="VhdS0/4e"; 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 q5-20020a50cc85000000b0056e03d53c48si2730279edi.291.2024.04.13.08.19.42; Sat, 13 Apr 2024 08:19:42 -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="VhdS0/4e"; 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 19C0568D352; Sat, 13 Apr 2024 18:19:37 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lf1-f50.google.com (mail-lf1-f50.google.com [209.85.167.50]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E2B1268D347 for ; Sat, 13 Apr 2024 18:19:30 +0300 (EEST) Received: by mail-lf1-f50.google.com with SMTP id 2adb3069b0e04-518a3e0d2e4so582606e87.0 for ; Sat, 13 Apr 2024 08:19:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1713021570; x=1713626370; 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=S9kqOE4ctDd5FETbzVhvpbzheAXOEQgqOg6IlmE5VAY=; b=VhdS0/4eWnKLMT2jSelaJIVN1mhf3Ny69rVBcLDVvSDhvNzv3negzYb//jCISi6EwT XfCQ2Skwg4dfXpqIbabln7WSWFfs9kzvtTbBXKlpKQT1wcoNjgyH9Pt/lqudyf4zzPd/ Twtf6hbzM0TDBqzU8F7s11BRpDX0zrOpT5929YwwV9CffkL0oyHzfTq36xcHHqVSMRoq oLeey+e4rOfbUqlyFJA0Us6KzrPq7RfjPv2RoCeUZxcVUoibmIaa9VEoogAu3i96+fDv 31FjpPdXZMlpS5ANBmne5n+/5EFfVe8H3X28nG5pDFynJ1GP6meI7a0kFFyl6evQFUj3 EjOw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1713021570; x=1713626370; 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=S9kqOE4ctDd5FETbzVhvpbzheAXOEQgqOg6IlmE5VAY=; b=Sp8JwBp6aM8AclmkW2zwEvHHLAIU+T0rn9nx3kg4qUEZwU8GohkDy57PqpxDRyidAw aq4V0R+hK4PzP02m2PGgbqkceoBwlkpksWtdUHmUsvrdauJcqBnXKqJ0YrUORvErtRP6 yWQcdc/E54v/RQKC4NHSfEXAQhkVtXRmH7ftxibgvCTd+4Jua9Ljx4qjL5FHow3x0l7V VkzRSMy+MJ4pAZTLxCFuACkJOpLnao11+nY/bjstaCym5yII8IOYqGYjVnyRzGviS1Wm fecGrq/b8fFTC/wDWBXk1+iI9vK6rVoYbnO3eyN+LtfPVUJzDidawDJkpyBZbZ8rnUs7 Yqbg== X-Gm-Message-State: AOJu0YxD2PEx4YU6F6eOxGTWhGDLo6zSaX8/T7hTcC1jr1Ta6/ZeDDkX L4b+cOS7SAO+z07vQdQhr5T4DTvg3nlrGZ29hktPzNe9/ep0K1+CCTdOZg== X-Received: by 2002:a19:9108:0:b0:513:d71e:eebd with SMTP id t8-20020a199108000000b00513d71eeebdmr2684768lfd.32.1713021569646; Sat, 13 Apr 2024 08:19:29 -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.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 13 Apr 2024 08:19:29 -0700 (PDT) From: =?utf-8?q?Kacper_Michaj=C5=82ow?= To: ffmpeg-devel@ffmpeg.org Date: Sat, 13 Apr 2024 17:18:25 +0200 Message-ID: <20240413151838.520-3-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 3/3] avcodec/libzvbi-teletextdec: 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: 6eWxxVP2LrRR Fixes remaining \r\n is ASS header after 57c545090d. Fixes AVERROR_BUG error during init as this decoder expected `\r\n` in default ASS header. strstr(..., "\r\n[Events]\r\n") failed after changes in 57c545090d. Fixes: 57c545090d --- libavcodec/libzvbi-teletextdec.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libavcodec/libzvbi-teletextdec.c b/libavcodec/libzvbi-teletextdec.c index 68ffe1f76c..e02ecb8b3a 100644 --- a/libavcodec/libzvbi-teletextdec.c +++ b/libavcodec/libzvbi-teletextdec.c @@ -91,7 +91,7 @@ static int my_ass_subtitle_header(AVCodecContext *avctx) if (ret < 0) return ret; - event_pos = strstr(avctx->subtitle_header, "\r\n[Events]\r\n"); + event_pos = strstr(avctx->subtitle_header, "\n[Events]\n"); if (!event_pos) return AVERROR_BUG; @@ -106,7 +106,7 @@ static int my_ass_subtitle_header(AVCodecContext *avctx) "0,0," /* Spacing, Angle */ "3,0.1,0," /* BorderStyle, Outline, Shadow */ "5,1,1,1," /* Alignment, Margin[LRV] */ - "0\r\n" /* Encoding */ + "0\n" /* Encoding */ "Style: " "Subtitle," /* Name */ "Monospace,16," /* Font{name,size} */ @@ -116,7 +116,7 @@ static int my_ass_subtitle_header(AVCodecContext *avctx) "0,0," /* Spacing, Angle */ "1,1,1," /* BorderStyle, Outline, Shadow */ "8,48,48,20," /* Alignment, Margin[LRV] */ - "0\r\n" /* Encoding */ + "0\n" /* Encoding */ , event_pos); if (!new_header)