From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id C1D024959A for ; Sat, 13 Apr 2024 15:19:32 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 8D6FE68D342; Sat, 13 Apr 2024 18:19:31 +0300 (EEST) 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-Google-Smtp-Source: AGHT+IH6hxM/NAEv3i+7pUvZJiq6sbZedVEhTFXG05qbEhIrmeV7Fx+J9k0WlX1xAot9h2Z2OCkcWQ== 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=20Michaj=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=20Michaj=C5=82ow?= Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: 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, -- 2.43.0 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".