Merge commit '54dcd2288546e135986338107ea87db1fcedd633'

[ffmpeg] / libavcodec / samidec.c

diff --git a/libavcodec/samidec.c b/libavcodec/samidec.c
index 16f3f58c1cfeb7fba0bdf91d4ba0ba263901a543..262042475085968bc4d856edd79f23e9bd3c8436 100644 (file)
--- a/libavcodec/samidec.c
+++ b/libavcodec/samidec.c
@@ -113,10 +113,14 @@ static int sami_paragraph_to_ass(AVCodecContext *avctx, const char *src)
 
     av_bprint_clear(&sami->full);
     if (sami->source.len) {
-        ff_htmlmarkup_to_ass(avctx, dst_source, sami->source.str);
+        ret = ff_htmlmarkup_to_ass(avctx, dst_source, sami->source.str);
+        if (ret < 0)
+            goto end;
         av_bprintf(&sami->full, "{\\i1}%s{\\i0}\\N", sami->encoded_source.str);
     }
-    ff_htmlmarkup_to_ass(avctx, dst_content, sami->content.str);
+    ret = ff_htmlmarkup_to_ass(avctx, dst_content, sami->content.str);
+    if (ret < 0)
+        goto end;
     av_bprintf(&sami->full, "%s", sami->encoded_content.str);
 
 end: