lavfi/drawtext: fix crash when no text, file or timecode provided
authorClément Bœsch <clement@stupeflix.com>
Mon, 21 Dec 2015 14:54:20 +0000 (15:54 +0100)
committerClément Bœsch <clement@stupeflix.com>
Mon, 21 Dec 2015 14:54:20 +0000 (15:54 +0100)
libavfilter/vf_drawtext.c

index fc77be4..beec018 100644 (file)
@@ -610,12 +610,6 @@ static av_cold int init(AVFilterContext *ctx)
             return err;
     }
 
-#if CONFIG_LIBFRIBIDI
-    if (s->text_shaping)
-        if ((err = shape_text(ctx)) < 0)
-            return err;
-#endif
-
     if (s->reload && !s->textfile)
         av_log(ctx, AV_LOG_WARNING, "No file to reload\n");
 
@@ -636,6 +630,12 @@ static av_cold int init(AVFilterContext *ctx)
         return AVERROR(EINVAL);
     }
 
+#if CONFIG_LIBFRIBIDI
+    if (s->text_shaping)
+        if ((err = shape_text(ctx)) < 0)
+            return err;
+#endif
+
     if ((err = FT_Init_FreeType(&(s->library)))) {
         av_log(ctx, AV_LOG_ERROR,
                "Could not load FreeType: %s\n", FT_ERRMSG(err));