aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Rheinhardt <andreas.rheinhardt@gmail.com>2020-10-17 19:26:35 +0200
committerAndreas Rheinhardt <andreas.rheinhardt@gmail.com>2020-10-19 05:09:00 +0200
commitba795890ec2de3150023433044cb4c9c5d1e7c74 (patch)
treec20530b7f7435980661f59a0504ffd85768727ea
parentc84a91eff73d6fa3b75cea75ce389ef94e9327b1 (diff)
downloadffmpeg-ba795890ec2de3150023433044cb4c9c5d1e7c74.tar.gz
avcodec/movtextdec: Avoid loop when writing UTF-8 character to AVBPrint
Reviewed-by: Philip Langdale <philipl@overt.org> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
-rw-r--r--libavcodec/movtextdec.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/libavcodec/movtextdec.c b/libavcodec/movtextdec.c
index 1bfca8b79d..e5ce58a184 100644
--- a/libavcodec/movtextdec.c
+++ b/libavcodec/movtextdec.c
@@ -430,7 +430,6 @@ static int text_to_ass(AVBPrint *buf, const char *text, const char *text_end,
av_log(avctx, AV_LOG_ERROR, "invalid UTF-8 byte in subtitle\n");
len = 1;
}
- for (i = 0; i < len; i++) {
switch (*text) {
case '\r':
break;
@@ -438,11 +437,10 @@ static int text_to_ass(AVBPrint *buf, const char *text, const char *text_end,
av_bprintf(buf, "\\N");
break;
default:
- av_bprint_chars(buf, *text, 1);
+ av_bprint_append_data(buf, text, len);
break;
}
- text++;
- }
+ text += len;
text_pos++;
}