virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

avocdec/ass: simplify linebreaks

Browse Source 
ff_ass_subtitle_header_* still used explicit CRLF linebreaks
eventhough they will get normalised to LF later since commit
7bf1b9b357. Just directly use LF.
This commit is contained in:
Oneric 2024-02-19 22:42:27 +01:00 committed by Stefano Sabatini
parent 0fc975c0d3
commit 57c545090d
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
libavcodec/ass.c
View File

@ -35,15 +35,15 @@ int ff_ass_subtitle_header_full(AVCodecContext *avctx,
int border_style, int alignment) int border_style, int alignment)
{ {
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"
"ScaledBorderAndShadow: yes\r\n" "ScaledBorderAndShadow: yes\n"
"YCbCr Matrix: None\r\n" "YCbCr Matrix: None\n"
"\r\n" "\n"
"[V4+ Styles]\r\n" "[V4+ Styles]\n"
/* ASS (v4+) header */ /* ASS (v4+) header */
"Format: Name, " "Format: Name, "
@ -54,7 +54,7 @@ int ff_ass_subtitle_header_full(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 */
@ -65,11 +65,11 @@ int ff_ass_subtitle_header_full(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] */
"1\r\n" /* Encoding */ "1\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) : "",
play_res_x, play_res_y, font, font_size, play_res_x, play_res_y, font, font_size,
primary_color, secondary_color, outline_color, back_color, primary_color, secondary_color, outline_color, back_color,