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>

diff --git a/libavcodec/movtextdec.c b/libavcodec/movtextdec.c
index 1bfca8b79d43bee1e8012a08f5b3c3265878aa0a..e5ce58a1845bc283243e6a7d2aad3c9133427b03 100644 (file)
--- 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++;
     }