Browse code

lavfi/drawtext: fix crash when no text, file or timecode provided

Clément Bœsch authored on 2015/12/21 23:54:20
Showing 1 changed files
... ...
@@ -610,12 +610,6 @@ static av_cold int init(AVFilterContext *ctx)
610 610
             return err;
611 611
     }
612 612
 
613
-#if CONFIG_LIBFRIBIDI
614
-    if (s->text_shaping)
615
-        if ((err = shape_text(ctx)) < 0)
616
-            return err;
617
-#endif
618
-
619 613
     if (s->reload && !s->textfile)
620 614
         av_log(ctx, AV_LOG_WARNING, "No file to reload\n");
621 615
 
... ...
@@ -636,6 +630,12 @@ static av_cold int init(AVFilterContext *ctx)
636 636
         return AVERROR(EINVAL);
637 637
     }
638 638
 
639
+#if CONFIG_LIBFRIBIDI
640
+    if (s->text_shaping)
641
+        if ((err = shape_text(ctx)) < 0)
642
+            return err;
643
+#endif
644
+
639 645
     if ((err = FT_Init_FreeType(&(s->library)))) {
640 646
         av_log(ctx, AV_LOG_ERROR,
641 647
                "Could not load FreeType: %s\n", FT_ERRMSG(err));