History

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

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

Kacper Michajłow committed 2 years ago

Commit 0105ff51 parent b5f26c41 file · +12 −12Browse files

Showing the changes to libavcodec (1 of 1 file). Show all

Unified · Split

libavcodec/libaribb24.c+12−12
@@ -96,13 +96,13 @@ static int libaribb24_generate_ass_header(AVCodecContext *avctx) · 95 unmodified lines
96 font_size = get_profile_font_size(avctx);96 font_size = get_profile_font_size(avctx);
97 97
98 avctx->subtitle_header = av_asprintf(98 avctx->subtitle_header = av_asprintf(
99 "[Script Info]\r\n"99 "[Script Info]\n"
100 "; Script generated by FFmpeg/Lavc%s\r\n"100 "; Script generated by FFmpeg/Lavc%s\n"
101 "ScriptType: v4.00+\r\n"101 "ScriptType: v4.00+\n"
102 "PlayResX: %d\r\n"102 "PlayResX: %d\n"
103 "PlayResY: %d\r\n"103 "PlayResY: %d\n"
104 "\r\n"104 "\n"
105 "[V4+ Styles]\r\n"105 "[V4+ Styles]\n"
106 106
107 /* ASSv4 header */107 /* ASSv4 header */
108 "Format: Name, "108 "Format: Name, "
@@ -113,7 +113,7 @@ static int libaribb24_generate_ass_header(AVCodecContext *avctx) · 4 unmodified lines
113 "Spacing, Angle, "113 "Spacing, Angle, "
114 "BorderStyle, Outline, Shadow, "114 "BorderStyle, Outline, Shadow, "
115 "Alignment, MarginL, MarginR, MarginV, "115 "Alignment, MarginL, MarginR, MarginV, "
116 "Encoding\r\n"116 "Encoding\n"
117 117
118 "Style: "118 "Style: "
119 "Default," /* Name */119 "Default," /* Name */
@@ -124,11 +124,11 @@ static int libaribb24_generate_ass_header(AVCodecContext *avctx) · 4 unmodified lines
124 "0,0," /* Spacing, Angle */124 "0,0," /* Spacing, Angle */
125 "%d,1,0," /* BorderStyle, Outline, Shadow */125 "%d,1,0," /* BorderStyle, Outline, Shadow */
126 "%d,10,10,10," /* Alignment, Margin[LRV] */126 "%d,10,10,10," /* Alignment, Margin[LRV] */
127 "0\r\n" /* Encoding */127 "0\n" /* Encoding */
128 128
129 "\r\n"129 "\n"
130 "[Events]\r\n"130 "[Events]\n"
131 "Format: Layer, Start, End, Style, Name, MarginL, MarginR, MarginV, Effect, Text\r\n",131 "Format: Layer, Start, End, Style, Name, MarginL, MarginR, MarginV, Effect, Text\n",
132 !(avctx->flags & AV_CODEC_FLAG_BITEXACT) ? AV_STRINGIFY(LIBAVCODEC_VERSION) : "",132 !(avctx->flags & AV_CODEC_FLAG_BITEXACT) ? AV_STRINGIFY(LIBAVCODEC_VERSION) : "",
133 plane_width, plane_height,133 plane_width, plane_height,
134 ASS_DEFAULT_FONT, font_size, ASS_DEFAULT_COLOR,134 ASS_DEFAULT_FONT, font_size, ASS_DEFAULT_COLOR,

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t