virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-04 22:03:09 +02:00
Code Issues Releases Activity

avcodec/libaribb24: change new lines to \n in ASS header

Browse Source 
Fixes remaining \r\n is ASS header after 57c545090d.

Signed-off-by: Kacper Michajłow <kasper93@gmail.com>
Signed-off-by: Marton Balint <cus@passwd.hu>
This commit is contained in:
Kacper Michajłow
2024-05-10 22:30:01 +02:00
committed by Marton Balint
parent b5f26c4dd8
commit 0105ff554b
1 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
libavcodec/libaribb24.c
View File

@ -96,13 +96,13 @@ static int libaribb24_generate_ass_header(AVCodecContext *avctx)
font_size = get_profile_font_size(avctx); font_size = get_profile_font_size(avctx);
avctx->subtitle_header = av_asprintf( avctx->subtitle_header = av_asprintf(
"[Script Info]\r\n" "[Script Info]\n"
"; Script generated by FFmpeg/Lavc%s\r\n" "; Script generated by FFmpeg/Lavc%s\n"
"ScriptType: v4.00+\r\n" "ScriptType: v4.00+\n"
"PlayResX: %d\r\n" "PlayResX: %d\n"
"PlayResY: %d\r\n" "PlayResY: %d\n"
"\r\n" "\n"
"[V4+ Styles]\r\n" "[V4+ Styles]\n"
/* ASSv4 header */ /* ASSv4 header */
"Format: Name, " "Format: Name, "
@ -113,7 +113,7 @@ static int libaribb24_generate_ass_header(AVCodecContext *avctx)
"Spacing, Angle, " "Spacing, Angle, "
"BorderStyle, Outline, Shadow, " "BorderStyle, Outline, Shadow, "
"Alignment, MarginL, MarginR, MarginV, " "Alignment, MarginL, MarginR, MarginV, "
"Encoding\r\n" "Encoding\n"
"Style: " "Style: "
"Default," /* Name */ "Default," /* Name */
@ -124,11 +124,11 @@ static int libaribb24_generate_ass_header(AVCodecContext *avctx)
"0,0," /* Spacing, Angle */ "0,0," /* Spacing, Angle */
"%d,1,0," /* BorderStyle, Outline, Shadow */ "%d,1,0," /* BorderStyle, Outline, Shadow */
"%d,10,10,10," /* Alignment, Margin[LRV] */ "%d,10,10,10," /* Alignment, Margin[LRV] */
"0\r\n" /* Encoding */ "0\n" /* Encoding */
"\r\n" "\n"
"[Events]\r\n" "[Events]\n"
"Format: Layer, Start, End, Style, Name, MarginL, MarginR, MarginV, Effect, Text\r\n", "Format: Layer, Start, End, Style, Name, MarginL, MarginR, MarginV, Effect, Text\n",
!(avctx->flags & AV_CODEC_FLAG_BITEXACT) ? AV_STRINGIFY(LIBAVCODEC_VERSION) : "", !(avctx->flags & AV_CODEC_FLAG_BITEXACT) ? AV_STRINGIFY(LIBAVCODEC_VERSION) : "",
plane_width, plane_height, plane_width, plane_height,
ASS_DEFAULT_FONT, font_size, ASS_DEFAULT_COLOR, ASS_DEFAULT_FONT, font_size, ASS_DEFAULT_COLOR,