[FFmpeg-cvslog] avcodec/libzvbi-teletextdec: change new lines to \n in ASS header
Kacper Michajłow
git at videolan.org
Sat May 17 22:41:27 EEST 2025
ffmpeg | branch: master | Kacper Michajłow <kasper93 at gmail.com> | Fri May 10 22:30:03 2024 +0200| [eb6dc952cbd479bf43673af9ca0bc83f37f8f329] | committer: Marton Balint
avcodec/libzvbi-teletextdec: change new lines to \n in ASS header
Fixes remaining \r\n is ASS header after 57c545090d.
Fixes AVERROR_BUG error during init as this decoder expected `\r\n` in
default ASS header. strstr(..., "\r\n[Events]\r\n") failed after changes
in 57c545090d.
Fixes ticket #11545.
Fixes: 57c545090d
Signed-off-by: Kacper Michajłow <kasper93 at gmail.com>
Signed-off-by: Marton Balint <cus at passwd.hu>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=eb6dc952cbd479bf43673af9ca0bc83f37f8f329
---
libavcodec/libzvbi-teletextdec.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/libavcodec/libzvbi-teletextdec.c b/libavcodec/libzvbi-teletextdec.c
index 68ffe1f76c..e02ecb8b3a 100644
--- a/libavcodec/libzvbi-teletextdec.c
+++ b/libavcodec/libzvbi-teletextdec.c
@@ -91,7 +91,7 @@ static int my_ass_subtitle_header(AVCodecContext *avctx)
if (ret < 0)
return ret;
- event_pos = strstr(avctx->subtitle_header, "\r\n[Events]\r\n");
+ event_pos = strstr(avctx->subtitle_header, "\n[Events]\n");
if (!event_pos)
return AVERROR_BUG;
@@ -106,7 +106,7 @@ static int my_ass_subtitle_header(AVCodecContext *avctx)
"0,0," /* Spacing, Angle */
"3,0.1,0," /* BorderStyle, Outline, Shadow */
"5,1,1,1," /* Alignment, Margin[LRV] */
- "0\r\n" /* Encoding */
+ "0\n" /* Encoding */
"Style: "
"Subtitle," /* Name */
"Monospace,16," /* Font{name,size} */
@@ -116,7 +116,7 @@ static int my_ass_subtitle_header(AVCodecContext *avctx)
"0,0," /* Spacing, Angle */
"1,1,1," /* BorderStyle, Outline, Shadow */
"8,48,48,20," /* Alignment, Margin[LRV] */
- "0\r\n" /* Encoding */
+ "0\n" /* Encoding */
, event_pos);
if (!new_header)
More information about the ffmpeg-cvslog
mailing list