Skip to content

Commit 0105ff5

Browse files
kasper93cus
authored andcommitted
avcodec/libaribb24: change new lines to \n in ASS header
Fixes remaining \r\n is ASS header after 57c5450. Signed-off-by: Kacper Michajłow <[email protected]> Signed-off-by: Marton Balint <[email protected]>
1 parent b5f26c4 commit 0105ff5

File tree

1 file changed

+12
-12
lines changed

1 file changed

+12
-12
lines changed

libavcodec/libaribb24.c

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -96,13 +96,13 @@ static int libaribb24_generate_ass_header(AVCodecContext *avctx)
9696
font_size = get_profile_font_size(avctx);
9797

9898
avctx->subtitle_header = av_asprintf(
99-
"[Script Info]\r\n"
100-
"; Script generated by FFmpeg/Lavc%s\r\n"
101-
"ScriptType: v4.00+\r\n"
102-
"PlayResX: %d\r\n"
103-
"PlayResY: %d\r\n"
104-
"\r\n"
105-
"[V4+ Styles]\r\n"
99+
"[Script Info]\n"
100+
"; Script generated by FFmpeg/Lavc%s\n"
101+
"ScriptType: v4.00+\n"
102+
"PlayResX: %d\n"
103+
"PlayResY: %d\n"
104+
"\n"
105+
"[V4+ Styles]\n"
106106

107107
/* ASSv4 header */
108108
"Format: Name, "
@@ -113,7 +113,7 @@ static int libaribb24_generate_ass_header(AVCodecContext *avctx)
113113
"Spacing, Angle, "
114114
"BorderStyle, Outline, Shadow, "
115115
"Alignment, MarginL, MarginR, MarginV, "
116-
"Encoding\r\n"
116+
"Encoding\n"
117117

118118
"Style: "
119119
"Default," /* Name */
@@ -124,11 +124,11 @@ static int libaribb24_generate_ass_header(AVCodecContext *avctx)
124124
"0,0," /* Spacing, Angle */
125125
"%d,1,0," /* BorderStyle, Outline, Shadow */
126126
"%d,10,10,10," /* Alignment, Margin[LRV] */
127-
"0\r\n" /* Encoding */
127+
"0\n" /* Encoding */
128128

129-
"\r\n"
130-
"[Events]\r\n"
131-
"Format: Layer, Start, End, Style, Name, MarginL, MarginR, MarginV, Effect, Text\r\n",
129+
"\n"
130+
"[Events]\n"
131+
"Format: Layer, Start, End, Style, Name, MarginL, MarginR, MarginV, Effect, Text\n",
132132
!(avctx->flags & AV_CODEC_FLAG_BITEXACT) ? AV_STRINGIFY(LIBAVCODEC_VERSION) : "",
133133
plane_width, plane_height,
134134
ASS_DEFAULT_FONT, font_size, ASS_DEFAULT_COLOR,

0 commit comments

Comments
 (0)