virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-10 06:10:52 +02:00
Code Issues Releases Activity

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

Browse Source
This commit is contained in:
Clément Bœsch
2015-12-21 15:54:20 +01:00
parent a142308dcd
commit 4cb26c3c35
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
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));