ffmpeg | branch: master | Clément Bœsch <clem...@stupeflix.com> | Mon Dec 21 15:54:20 2015 +0100| [4cb26c3c354e3dc0adcd5d69a4c1bcf1246d15d9] | committer: Clément Bœsch
lavfi/drawtext: fix crash when no text, file or timecode provided > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=4cb26c3c354e3dc0adcd5d69a4c1bcf1246d15d9 --- libavfilter/vf_drawtext.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/libavfilter/vf_drawtext.c b/libavfilter/vf_drawtext.c index fc77be4..beec018 100644 --- a/libavfilter/vf_drawtext.c +++ b/libavfilter/vf_drawtext.c @@ -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)); _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
