Browse Source

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

tags/n3.0
Clément Bœsch 9 years ago
parent
commit
4cb26c3c35
1 changed files with 6 additions and 6 deletions
  1. +6
    -6
      libavfilter/vf_drawtext.c

+ 6
- 6
libavfilter/vf_drawtext.c View 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));


Loading…
Cancel
Save