[FFmpeg-cvslog] lavc/ass_split: fix parsing utf8 scripts

John Stebbins git at videolan.org
Fri Apr 10 19:33:10 EEST 2020


ffmpeg | branch: master | John Stebbins <jstebbins at jetheaddev.com> | Sat Apr  4 13:17:33 2020 -0600| [a52eef68d4ba4b7166b8a7681e1a8812c2866823] | committer: Philip Langdale

lavc/ass_split: fix parsing utf8 scripts

The [Script Info] section was skipped if starts with UTF8 BOM

Signed-off-by: Philip Langdale <philipl at overt.org>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a52eef68d4ba4b7166b8a7681e1a8812c2866823
---

 libavcodec/ass_split.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/libavcodec/ass_split.c b/libavcodec/ass_split.c
index 67da7c6d84..c2c388d9f0 100644
--- a/libavcodec/ass_split.c
+++ b/libavcodec/ass_split.c
@@ -376,6 +376,8 @@ ASSSplitContext *ff_ass_split(const char *buf)
     ASSSplitContext *ctx = av_mallocz(sizeof(*ctx));
     if (!ctx)
         return NULL;
+    if (buf && !memcmp(buf, "\xef\xbb\xbf", 3)) // Skip UTF-8 BOM header
+        buf += 3;
     ctx->current_section = -1;
     if (ass_split(ctx, buf) < 0) {
         ff_ass_split_free(ctx);



More information about the ffmpeg-cvslog mailing list