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)