From patchwork Fri May 10 20:30:02 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Kacper Michajlow X-Patchwork-Id: 48711 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:1706:b0:1af:cdee:28c5 with SMTP id nv6csp825624pzb; Fri, 10 May 2024 13:31:28 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWyGy+y7ONy3GXgPnsbz4ENXHyMWbzXOkxxzmjCCym2G6DlXSN4fklNlL0Jknsxns6P0zxWiB+bHzo5nCigAogKN7lpiaydoQVwDA== X-Google-Smtp-Source: AGHT+IGKm8aHSiGQSkMXqX7cKBt6EHnDyRkFf6q5CIeX1hod6w+2DlS1YHccW3TSyQ08BprRQfLl X-Received: by 2002:a17:906:fe45:b0:a5a:44a0:8e21 with SMTP id a640c23a62f3a-a5a44afd0demr21789266b.69.1715373088255; Fri, 10 May 2024 13:31:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1715373088; cv=none; d=google.com; s=arc-20160816; b=TVJZeg2k07zi1RtBdIjKrR+dDH7I424c4apJe/xDIix+xH8R70KkX7POSrOCmqGmzP euUlNymFX4BoFN4nzdPQIFnfYFhmO4l4ZABjWQZoYNcDbELa8z+uh17J4FJb4VdMfz7t B6MDAhamRItacBeMxUVK8DTe/v57/lBNBXjEDLEPiInLAa9wVEdTOh+ocMZnfPmnCIqi JPR10s2xeTKMfmH+yp9v9sUyoc+7qbnPa1tdaRtFmStyjcJ1YWU8/L3ZBMkwvmJ2Bs4/ qG2bFTVY4cmtlktrntV2wsqmE2XAO1FJjfux1eEXOVc8whnkbTilV+feJqfnDZ2Amizp HTIw== 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=irjeUmMyzoRXzuimbLiPQE0a0e8r3bVmGfhQtEQ5Guc=; fh=VehHF75ibtIiOcMFupA+RvAd8F/HWiWMZFlcjyRnn54=; b=rvLcBO8eQ/koPYMaFgy59eJ8fTHG8q3qIcQ4TNFWTqC3sIi9FIelw22+3S6eBAJdJw 3ss90YOsYKyO3XAAAyR6sife03oxMPuXP0epYcz4mbBm3M0jza9QxMr6Yv3RgCythhmt 10zYzIqWKymEcF9XbjPAvJehAwI0FMopGrpK1z7RhGgoos3b06OuLodDRvUJgjjVT5N9 6Q+gxf6oTF4RaoR4D/m0iyyLBqf/dPsKm9N0bJ/XfdQIvPO1VZQyiEAoxOoKW8s4U6WP MZcU5QnX8I4PBBncYr0xmUm+TGUjtUv+0EMymoKC6AiGIUlc3KJM96KJBBKC59UOWXFU k/SA==; 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=Lsex6DgF; 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 a640c23a62f3a-a5a17b22057si233906566b.479.2024.05.10.13.31.27; Fri, 10 May 2024 13:31:28 -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=Lsex6DgF; 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 1BB8F68D54C; Fri, 10 May 2024 23:31:19 +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 8887468D3FA for ; Fri, 10 May 2024 23:31:11 +0300 (EEST) Received: by mail-lf1-f54.google.com with SMTP id 2adb3069b0e04-51f0f6b613dso2790000e87.1 for ; Fri, 10 May 2024 13:31:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1715373070; x=1715977870; 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=gfPPsXy2OsqB4ZfYEs0XL0ey+ffxdNun2+T7QmbGE4s=; b=Lsex6DgFT25oSmJqy/Nm82Hg+smajTD8uTOIzPt+u1PHsrkNNpwFfFG2wHip41EBPW +yzc5Ayx4Se/2+84hBVmkvxGqP0fr7EYo9kpT6upnOxdr4hW0M7sY2Puz0pheIzxsWIF a7GxBQ0FLleEZsWPDQKXUnelpXtuGXWSkeuG+dyFV0l79pQcY2FXvCoWvrSfyDYAt9Tm QaDpDUmmWHbGMhld3NUlMaAvEfsHmPsM0IShq+wfeq3iaYAZVCAAy1bNMF7Cpjihe5gv YDnarl2ozaTC/Bx9oC0ku/DRt+C9/+7DpJsnd26Fy6H64i7PePt5EqBB/V422pLBw0gr 4zXA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1715373070; x=1715977870; 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=gfPPsXy2OsqB4ZfYEs0XL0ey+ffxdNun2+T7QmbGE4s=; b=BY553HDaXcRDxpuRwJd9R2DvAJ10Y0YeLtEt1k4bCvuvLCf0m7FPHXQ46QifOSaj8X hWfw/UwgxFZa3NdJD/OnLmljPTqivJv044VPQhXWG43K6K1iT9CWtSjTvpKQEsEQ/I1Z vp0HCIAGMjEAyHmne4HLB8y02LXbX8PAgKCkukK61M2KF/YvXwQGJdjjGSJSOyDSXTOq BcE29+UmDaaLaxcrDBqT/IpUz7+GHQfu8uwGpMQDmFmABwy3R8hBerKdx0JWkSbVfJx3 oDFNAI5joj4Yc5XuySnw8r7tJ+NvbQtioB2RpLKUdXfSKVjCyY8Ah8xw+WqqWUMhbax7 elhg== X-Gm-Message-State: AOJu0YxJ8xfFBA1uFu7PBG1rP4luWXReuZgtPMg/sD8BSgAo9fg33QCf WV31QWRC4r1DdAsAVHGR2Q4PiLpmQOMDEY782xFNbyEt/fGinfjG89/D0g== X-Received: by 2002:a05:6512:360c:b0:51d:8d56:6b15 with SMTP id 2adb3069b0e04-5220fc73595mr2172650e87.1.1715373070155; Fri, 10 May 2024 13:31:10 -0700 (PDT) Received: from localhost.localdomain (89-74-12-251.dynamic.chello.pl. [89.74.12.251]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-521f35ba6ffsm805287e87.95.2024.05.10.13.31.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 10 May 2024 13:31:09 -0700 (PDT) From: =?utf-8?q?Kacper_Michaj=C5=82ow?= To: ffmpeg-devel@ffmpeg.org Date: Fri, 10 May 2024 22:30:02 +0200 Message-ID: <20240510203017.1338-2-kasper93@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240510203017.1338-1-kasper93@gmail.com> References: <20240510203017.1338-1-kasper93@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 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: GxDp31lZD+eh Fixes remaining \r\n is ASS header after 57c545090d. Signed-off-by: Kacper Michajłow --- 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,